dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7205
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-06-06 16:34:37 +0700
message:
  Fixed bug NPE of paging.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-06-04 16:20:41 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-06-06 09:34:37 +0000
@@ -1549,10 +1549,10 @@
 			setFieldValue( 'key', keyParam.split( '=' )[1] )
 		}
 		
-		url = link + "?currentPage=" + currentPage + "&pageSize=" + pageSize;
-		
 		if ( $( '#filterKeyForm' ).length )
 		{
+			url = link + "?currentPage=" + currentPage + "&pageSize=" + pageSize;
+		
 			$( '#filterKeyForm' ).attr( 'action', url );
 			$( '#filterKeyForm' ).submit();
 		}