dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5957
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-02-14 17:03:54 +0100
message:
  Minor fix
modified:
  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/paging/paging.vm
  dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java


--
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-02-13 20:04:18 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2012-02-14 16:03:54 +0000
@@ -1516,10 +1516,8 @@
 
 function pagingList( currentPage, pageSize )
 {
-	jQuery.cookie( "currentPage", currentPage );
-	
 	var baseLink = jQuery( "#baseLink" ).val();	
-	var url = baseLink + 'currentPage=' + currentPage + '&pageSize=' + pageSize;
+	var url = baseLink + "currentPage=" + currentPage + "&pageSize=" + pageSize;
 	
 	window.location.href = url;
 }

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2012-02-13 19:27:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/paging/paging.vm	2012-02-14 16:03:54 +0000
@@ -72,5 +72,5 @@
 </div>
 
 <script>
-
-</script>
\ No newline at end of file
+jQuery.cookie( "currentPage", ${currentPage} );
+</script>

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java	2011-08-02 09:12:51 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/paging/ActionPagingSupport.java	2012-02-14 16:03:54 +0000
@@ -46,6 +46,11 @@
 {
     protected Integer currentPage;
 
+    public Integer getCurrentPage()
+    {
+        return currentPage;
+    }
+
     public void setCurrentPage( Integer currentPage )
     {
         this.currentPage = currentPage;