------------------------------------------------------------
revno: 12979
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Tue 2013-11-19 21:19:30 +0100
message:
minor fix in fred parent filtering, allow uuid as parent filter
modified:
dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.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-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-11-19 20:03:19 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-11-19 20:19:30 +0000
@@ -394,7 +394,8 @@
for ( String parent : parentList )
{
- if ( organisationUnit.getParent() != null && organisationUnit.getParent().getUid().equals( parent ) )
+ if ( organisationUnit.getParent() != null &&
+ (organisationUnit.getParent().getUid().equals( parent ) || organisationUnit.getParent().getUuid().equals( parent )) )
{
shouldRemove = false;
break;
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
