← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6687: (patient) Minor fix for paging in tabular report.

 

------------------------------------------------------------
revno: 6687
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-04-23 13:31:40 +0700
message:
  (patient) Minor fix for paging 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	2012-04-20 10:24:33 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-04-23 06:31:40 +0000
@@ -1034,7 +1034,7 @@
 						xtype: 'textfield',
 						cls: 'tr-textfield-alt1',
 						id:'currentPage',
-						value: '1',
+						value: TR.state.currentPage,
 						listeners: {
 							added: function() {
 								TR.cmp.settings.currentPage = this;
@@ -1143,7 +1143,8 @@
             
         },
         setPagingToolbarStatus: function() {
-			if( TR.state.currentPage == TR.state.total == 1 )
+			if( TR.state.currentPage == TR.state.total 
+				&& TR.state.total== 1 )
 			{
 				Ext.getCmp('firstPageBtn').disable();
 				Ext.getCmp('previousPageBtn').disable();