------------------------------------------------------------
revno: 19406
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-06-15 12:06:57 +0700
message:
minor bugfix, paging for orgUnitController
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.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/organisationunit/OrganisationUnitController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2015-04-20 16:03:40 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2015-06-15 05:06:57 +0000
@@ -84,6 +84,7 @@
protected List<OrganisationUnit> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters, List<Order> orders )
{
List<OrganisationUnit> entityList;
+ boolean haveFilters = !filters.isEmpty();
Query query = queryService.getQueryFromUrl( getEntityClass(), filters, orders );
query.setDefaultOrder();
@@ -157,9 +158,9 @@
entityList = new ArrayList<>( manager.getAll( getEntityClass() ) );
Collections.sort( entityList, OrganisationUnitByLevelComparator.INSTANCE );
}
- else if ( options.hasPaging() && filters.isEmpty() )
+ else if ( options.hasPaging() && !haveFilters )
{
- int count = manager.getCount( getEntityClass() );
+ int count = queryService.count( query );
Pager pager = new Pager( options.getPage(), count, options.getPageSize() );
metaData.setPager( pager );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
