← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3666: removed old chaining. changed dhisPaging to use post instead of get

 

------------------------------------------------------------
revno: 3666
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-05-19 14:30:49 +0200
message:
  removed old chaining. changed dhisPaging to use post instead of get
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml


--
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
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js	2011-05-19 11:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.dhisPaging.js	2011-05-19 12:30:49 +0000
@@ -62,7 +62,7 @@
         var pagesize_input_id = id + "_pagesize_input";
         var $pagesize_input = $("#" + pagesize_input_id);
 
-        $.getJSON(settings.source, $.param( settings.params ), function(json) {
+        $.post(settings.source, $.param( settings.params ), function(json) {
             $select.empty();
             $select_page.empty();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2011-05-19 12:22:55 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/resources/struts.xml	2011-05-19 12:30:49 +0000
@@ -129,38 +129,6 @@
     
     <!-- Show add DataSet form chain -->
     
-    <action name="addDataSetForm2"
-      class="org.hisp.dhis.dataset.action.DataElementListFilteredByGroup">
-      <result name="success" type="chain">indicatorListFilteredByGroupChain</result>
-      <param name="requiredAuthorities">F_DATASET_ADD</param>
-    </action>
-
-    <action name="indicatorListFilteredByGroupChain"
-      class="org.hisp.dhis.dataset.action.IndicatorListFilteredByGroup">
-      <result name="success" type="chain">dataElementGroupListAddChain</result>
-      <param name="requiredAuthorities">F_DATASET_UPDATE</param>
-    </action>
-
-    <action name="dataElementGroupListAddChain"
-      class="org.hisp.dhis.dataset.action.DataElementGroupListAction">
-      <result name="success" type="chain">indicatorGroupListAddChain</result>
-      <param name="requiredAuthorities">F_DATASET_ADD</param>
-    </action>
-
-    <action name="indicatorGroupListAddChain"
-      class="org.hisp.dhis.dataset.action.IndicatorGroupListAction">
-      <result name="success" type="chain">periodTypeListAddChain</result>
-      <param name="requiredAuthorities">F_DATASET_ADD</param>
-    </action>
-
-    <action name="periodTypeListAddChain"
-      class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
-      <result name="success" type="velocity">/main.vm</result>
-      <param name="page">/dhis-web-maintenance-dataset/addDataSet.vm</param>
-      <param name="javascripts">javascript/shortName.js,javascript/dataSet.js</param>
-      <param name="requiredAuthorities">F_DATASET_ADD</param>
-    </action>
-
     <action name="addDataSetForm" class="org.hisp.dhis.dataset.action.PeriodTypeListAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-dataset/addDataSet.vm</param>