dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16419
committer: James Chang <jamesbchang@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-08-16 01:48:11 +0700
message:
  changes to Web API for getting organisation unit parents list
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	2014-08-15 15:23:25 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java	2014-08-15 18:48:11 +0000
@@ -215,7 +215,7 @@
         List<OrganisationUnit> organisationUnits = Lists.newArrayList();
         
         // Add organisation unit parents 
-        if ( organisationUnits != null )
+        if ( organisationUnit != null )
         {
             OrganisationUnit organisationUnitParent = organisationUnit.getParent();
 
@@ -225,10 +225,6 @@
                 organisationUnitParent = organisationUnitParent.getParent();   
             }
         }
-        else
-        {            
-            organisationUnits = Lists.newArrayList();            
-        }
         
         WebMetaData metaData = new WebMetaData();      
         metaData.setOrganisationUnits( organisationUnits );