dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2628
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-01-19 14:52:16 +0700
message:
  Fix bug: Cant increase the size of page and jump to other page using button into User module.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm


--
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	2011-01-17 14:26:28 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-01-19 07:52:16 +0000
@@ -1232,7 +1232,8 @@
 function changePageSize( baseLink )
 {
     var pageSize = jQuery("#sizeOfPage").val();
-    window.location.href = baseLink +"pageSize=" + pageSize ;
+	var currentPage = jQuery("#jumpToPage").val();
+    window.location.href = baseLink +"pageSize=" + pageSize +"&currentPage=" +currentPage;
 }
 
 function jumpToPage( baseLink )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2010-12-28 17:49:37 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/allUser.vm	2011-01-19 07:52:16 +0000
@@ -1,5 +1,5 @@
 <h3>$i18n.getString( "user_management" ) #openHelp( "users" )</h3>
-<form id="userForm" method="POST">
+
 <table style="width:100%">
 	<tr>
 		<td style="vertical-align:top">
@@ -79,7 +79,6 @@
 		tableSorter( 'userList' );
 	});
 </script>
-</form>
 
 <script type="text/javascript">
 	var i18n_confirm_delete = '$encoder.jsEscape( $i18n.getString( "confirm_delete_user" ) , "'")';