dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17615
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-11-29 17:12:58 +0700
message:
  minor paging fix
modified:
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.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-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java	2014-11-17 14:35:17 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java	2014-11-29 10:12:58 +0000
@@ -209,16 +209,12 @@
 
         Pager pager = metaData.getPager();
 
-        // enable object filter
-        if ( !filters.isEmpty() )
+        entityList = objectFilterService.filter( entityList, filters );
+
+        if ( hasPaging )
         {
-            entityList = objectFilterService.filter( entityList, filters );
-
-            if ( hasPaging )
-            {
-                pager = new Pager( options.getPage(), entityList.size(), options.getPageSize() );
-                entityList = PagerUtils.pageCollection( entityList, pager );
-            }
+            pager = new Pager( options.getPage(), entityList.size(), options.getPageSize() );
+            entityList = PagerUtils.pageCollection( entityList, pager );
         }
 
         postProcessEntities( entityList );