------------------------------------------------------------
revno: 18496
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Fri 2015-03-06 10:03:52 +0700
message:
paging fix for web-api
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 2015-02-26 09:27:36 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-03-06 03:03:52 +0000
@@ -168,7 +168,7 @@
entities = objectFilterService.filter( entities, filters );
translate( entities, translateOptions );
- if ( options.hasPaging() )
+ if ( options.hasPaging() && pager == null )
{
pager = new Pager( options.getPage(), entities.size(), options.getPageSize() );
entities = PagerUtils.pageCollection( entities, pager );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
