dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13523
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-12-31 22:27:02 +0700
message:
  Fix bugs - Get all events for downloading in tabular report
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js


--
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-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-12-31 03:05:28 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-12-31 15:27:02 +0000
@@ -1646,12 +1646,6 @@
 				p.ouMode = TR.cmp.settings.ouMode.getValue();
 			}
 			
-			// Paging
-			if(TR.state.currentPage==undefined){
-				TR.state.currentPage = 1;
-			}
-			p.page = TR.state.currentPage;
-			
 			// Get searching values
 			
 			p.dimension = [];
@@ -1919,10 +1913,16 @@
 				// Show report on grid
 				else
 				{
-					url += programId + ".json";
+					url += programId + ".json?";
 					if (Ext.getCmp('programStageCombobox').getValue() != '') {
-						url += "?stage=" + programStageId;
-					}
+						url += "stage=" + programStageId + "&";
+					}
+					// Paging
+					if(TR.state.currentPage==undefined){
+						TR.state.currentPage = 1;
+					}
+					url += "page=" + TR.state.currentPage;
+					
 					TR.util.mask.showMask(TR.cmp.region.center, TR.i18n.loading);
 					Ext.Ajax.request({
 						url: url,
@@ -2086,11 +2086,11 @@
 				// Show report on grid
 				else
 				{
-					url += programId + ".json";
+					url += programId + ".json?";
 					if (Ext.getCmp('programStageCombobox').getValue() != '') {
-						url += "?stage=" + programStageId;
+						url += "stage=" + programStageId + "&";
 					}
-					
+			
 					TR.util.mask.showMask(TR.cmp.region.center, TR.i18n.loading);
 					Ext.Ajax.request({
 						url: url,