dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4138
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-07-14 08:29:58 +0200
message:
  Renamed action
renamed:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java => dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== renamed file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java' => 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/SelectAction.java	2011-07-14 06:09:35 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2011-07-14 06:29:58 +0000
@@ -69,10 +69,10 @@
  * @author Torgeir Lorange Ostby
  * @version $Id: SelectAction.java 5930 2008-10-15 03:30:52Z tri $
  */
-public class SelectAction
+public class LoadFormAction
     implements Action
 {
-    private static final Log log = LogFactory.getLog( SelectAction.class );
+    private static final Log log = LogFactory.getLog( LoadFormAction.class );
 
     private static final String SECTION_FORM = "sectionform";
     

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-13 13:48:02 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/META-INF/dhis/beans.xml	2011-07-14 06:29:58 +0000
@@ -53,7 +53,7 @@
     <property name="selectedStateManager" ref="org.hisp.dhis.de.state.SelectedStateManager" />
   </bean>
 
-  <bean id="org.hisp.dhis.de.action.SelectAction" class="org.hisp.dhis.de.action.SelectAction" scope="prototype">
+  <bean id="org.hisp.dhis.de.action.LoadFormAction" class="org.hisp.dhis.de.action.LoadFormAction" scope="prototype">
     <property name="dataEntryFormService" ref="org.hisp.dhis.dataentryform.DataEntryFormService" />
     <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
     <property name="dataSetLockService" ref="org.hisp.dhis.datalock.DataSetLockService" />

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2011-07-12 14:44:28 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml	2011-07-14 06:29:58 +0000
@@ -42,7 +42,7 @@
       <result name="success" type="velocity-json">/dhis-web-dataentry/responseDisplayModes.vm</result>
     </action>
 
-    <action name="select" class="org.hisp.dhis.de.action.SelectAction">
+    <action name="loadForm" class="org.hisp.dhis.de.action.LoadFormAction">
       <result name="customform" type="velocity">/dhis-web-dataentry/customForm.vm</result>
       <result name="sectionform" type="velocity">/dhis-web-dataentry/sectionForm.vm</result>
       <result name="defaultform" type="velocity">/dhis-web-dataentry/defaultForm.vm</result>

=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-07-13 16:16:49 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2011-07-14 06:29:58 +0000
@@ -164,7 +164,7 @@
             {
                 showLoader();
                 $( '#selectedPeriodIndex' ).val( periodIndex );
-                $( '#contentDiv' ).load( 'select.action', loadDataValuesAndDisplayModes );
+                $( '#contentDiv' ).load( 'loadForm.action', loadDataValuesAndDisplayModes );
             } 
             else
             {
@@ -182,7 +182,7 @@
 {
     showLoader();
 
-    var url = 'select.action?displayMode=' + $( "input[name='displayMode']:checked" ).val();
+    var url = 'loadForm.action?displayMode=' + $( "input[name='displayMode']:checked" ).val();
 
     $( '#contentDiv' ).load( url, loadDataValues );
 }
@@ -209,7 +209,7 @@
         }
         else
         {
-        	var url = 'select.action?selectedPeriodIndex=' + periodIndex;
+        	var url = 'loadForm.action?selectedPeriodIndex=' + periodIndex;
         	
         	$( '#contentDiv' ).load( url, loadDataValuesAndDisplayModes );
         }