------------------------------------------------------------
revno: 21452
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Tue 2015-12-15 08:58:37 +0100
message:
support filtering in DimensionController, forces in-memory filtering by using
Query.setObjects()
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.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/DimensionController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-11-20 15:20:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-12-15 07:58:37 +0000
@@ -87,9 +87,24 @@
// -------------------------------------------------------------------------
@Override
- protected List<DimensionalObject> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters, List<Order> orders )
+ @SuppressWarnings( "unchecked" )
+ protected List<DimensionalObject> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters, List<Order> orders ) throws QueryParserException
{
- return dimensionService.getAllDimensions();
+ List<DimensionalObject> entityList;
+ Query query = queryService.getQueryFromUrl( DimensionalObject.class, filters, orders );
+ query.setDefaultOrder();
+ query.setObjects( dimensionService.getAllDimensions() );
+
+ if ( options.getOptions().containsKey( "query" ) )
+ {
+ entityList = Lists.newArrayList( manager.filter( getEntityClass(), options.getOptions().get( "query" ) ) );
+ }
+ else
+ {
+ entityList = (List<DimensionalObject>) queryService.query( query );
+ }
+
+ return entityList;
}
@Override
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
