------------------------------------------------------------
revno: 16891
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Wed 2014-10-01 15:39:12 +0700
message:
minor fix to getEntityList
modified:
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/InterpretationController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java
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/user/UserController.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserRoleController.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-09-30 04:38:03 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2014-10-01 08:39:12 +0000
@@ -197,7 +197,7 @@
}
}
- entityList = getEntityList( metaData, options );
+ entityList = getEntityList( metaData, options, filters );
}
}
@@ -523,11 +523,6 @@
// Helpers
//--------------------------------------------------------------------------
- protected List<T> getEntityList( WebMetaData metaData, WebOptions options )
- {
- return getEntityList( metaData, options, null );
- }
-
protected List<T> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<T> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/InterpretationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/InterpretationController.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/InterpretationController.java 2014-10-01 08:39:12 +0000
@@ -96,7 +96,7 @@
private CurrentUserService currentUserService;
@Override
- protected List<Interpretation> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<Interpretation> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<Interpretation> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-09-22 14:26:53 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2014-10-01 08:39:12 +0000
@@ -129,7 +129,7 @@
}
@Override
- protected List<MessageConversation> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<MessageConversation> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<MessageConversation> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/CategoryOptionComboController.java 2014-10-01 08:39:12 +0000
@@ -54,7 +54,7 @@
// name (clashes with getAllOrderedName)
// FIXME add paging also for this?
@Override
- protected List<DataElementCategoryOptionCombo> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<DataElementCategoryOptionCombo> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<DataElementCategoryOptionCombo> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageController.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/ProgramStageController.java 2014-10-01 08:39:12 +0000
@@ -61,7 +61,7 @@
}
@Override
- protected List<ProgramStage> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<ProgramStage> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<ProgramStage> entityList = new ArrayList<>();
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeController.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityAttributeController.java 2014-10-01 08:39:12 +0000
@@ -69,7 +69,7 @@
private ProgramService programService;
@Override
- protected List<TrackedEntityAttribute> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<TrackedEntityAttribute> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<TrackedEntityAttribute> entityList = new ArrayList<>();
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java 2014-08-15 07:40:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapViewController.java 2014-10-01 08:39:12 +0000
@@ -117,7 +117,7 @@
//--------------------------------------------------------------------------
@Override
- protected List<MapView> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<MapView> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<MapView> entityList;
=== 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 2014-09-29 18:38:31 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2014-10-01 08:39:12 +0000
@@ -71,7 +71,7 @@
private CurrentUserService currentUserService;
@Override
- protected List<OrganisationUnit> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<OrganisationUnit> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<OrganisationUnit> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java 2014-08-22 15:39:25 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserController.java 2014-10-01 08:39:12 +0000
@@ -109,7 +109,7 @@
}
@Override
- protected List<User> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<User> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
List<User> entityList;
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserRoleController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserRoleController.java 2014-06-11 20:27:54 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/UserRoleController.java 2014-10-01 08:39:12 +0000
@@ -52,9 +52,9 @@
private UserService userService;
@Override
- protected List<UserAuthorityGroup> getEntityList( WebMetaData metaData, WebOptions options )
+ protected List<UserAuthorityGroup> getEntityList( WebMetaData metaData, WebOptions options, List<String> filters )
{
- List<UserAuthorityGroup> entityList = super.getEntityList( metaData, options );
+ List<UserAuthorityGroup> entityList = super.getEntityList( metaData, options, filters );
if ( options.getOptions().containsKey( "canIssue" ) && Boolean.parseBoolean( options.getOptions().get( "canIssue" ) ) )
{
_______________________________________________
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
