dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9884
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-02-25 09:46:26 +0700
message:
  (Tabular report) Not allow to edit values in each cell in grid.
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-02-25 02:38:38 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2013-02-25 02:46:26 +0000
@@ -1598,11 +1598,11 @@
 				p.level = Ext.getCmp('levelCombobox').getValue();
 				
 				// orders
-				p.orderByOrgunitAsc = this.orderByOrgunitAsc;
-				p.orderByExecutionDateByAsc= this.orderByExecutionDateByAsc;
+				p.orderByOrgunitAsc = TR.state.orderByOrgunitAsc;
+				p.orderByExecutionDateByAsc= TR.state.orderByExecutionDateByAsc;
 				
 				p.programStageId = TR.cmp.params.programStage.getValue();
-				p.currentPage = this.currentPage;
+				p.currentPage = TR.state.currentPage;
 				
 				// organisation unit
 				p.orgunitIds = TR.state.orgunitIds;
@@ -4385,9 +4385,6 @@
 						text: TR.i18n.sort_by,
 						id: 'btnSortBy',
 						disabled: true,
-						execute: function() {
-							TR.exe.execute(false, true );
-						},
 						listeners: {
 							afterrender: function(b) {
 								this.menu = Ext.create('Ext.menu.Menu', {
@@ -4401,7 +4398,7 @@
 											minWidth: 105,
 											handler: function() {
 												TR.state.orderByOrgunitAsc = "true";
-												b.execute();
+												TR.exe.execute(false, true );
 											}
 										},
 										{
@@ -4410,7 +4407,7 @@
 											minWidth: 105,
 											handler: function() {
 												TR.state.orderByOrgunitAsc = "false";
-												b.execute();
+												TR.exe.execute(false, true );
 											}
 										}
 									]