Changeset 2012

Timestamp:

07/16/09 23:54:30 (3 years ago)

Author:

mswertz

Message:

FEATURE: enabled the sorting again; involved uncommenting of "sortattribute"

Location:

molgenis3_3/src/org/molgenis

Files:

• framework/screen/form/FormController.java (modified) (1 diff)
• framework/style/original/FormScreen.ftl (modified) (2 diffs)
• generators/R/RApi.java (modified) (1 diff)

molgenis3_3/src/org/molgenis/framework/screen/form/FormController.java

@@ -198 +198 @@
                         else if (action.equals("sort"))
                         {
-                                String attribute = request.getString("attribute");
+                                String attribute = request.getString("__sortattribute");
                                 if (pager.getOrderByField().equals(attribute))
                                 {

molgenis3_3/src/org/molgenis/framework/style/original/FormScreen.ftl

@@ -334 +334 @@
                                         <#else>
                         <#--<img src="res/img/close.png" title="hide ${input.getLabel()}" onclick="setInput('${screen.name}_form','_self','','${screen.name}','hideColumn','iframe'); document.forms.${screen.name}_form.attribute.value='${input.getName()}'; document.forms.${screen.name}_form.submit();" />-->
-                        <label class="tableheader" onclick="setInput('${screen.name}_form','_self','','${screen.name}','sort','iframe'); document.forms.${screen.name}_form.attribute.value='${input.getName()}'; document.forms.${screen.name}_form.submit();">
+                        <label class="tableheader" onclick="setInput('${screen.name}_form','_self','','${screen.name}','sort','iframe'); document.forms.${screen.name}_form.__sortattribute.value='${input.getName()}'; document.forms.${screen.name}_form.submit();">
                                         ${input.getLabel()}<#if screen.getSort() == input.getName()> <#if screen.getSortMode().toString() == "SORTASC"><img src="res/img/sort_asc.gif"><#else><img src="res/img/sort_desc.gif"></#if></#if>
                         </label>
@@ -453 +453 @@
         <input type="hidden" name="__show" />
         <input type="hidden" name="__offset" />
-        <!--<input type="hidden" name="attribute" />
-        <input type="hidden" name="operator" />
+        <input type="hidden" name="__sortattribute" />
+        <!--input type="hidden" name="operator" />
         <input type="hidden" name="value" />-->
         <input type="hidden" name="limit" />

molgenis3_3/src/org/molgenis/generators/R/RApi.java

@@ -27 +27 @@
                 Map<String, Object> templateArgs = createTemplateArguments(options);
                 
-                File targetFile = new File( this.getSourcePath(options) + model.getName().replace(".","/") + "/source.R" );
+                //File targetFile = new File( this.getSourcePath(options) + model.getName().replace(".","/") + "/source.R" );
+                File targetFile = new File( this.getSourcePath(options) + "/source.R" );
                 targetFile.getParentFile().mkdirs();