dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13366
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2013-12-21 17:50:48 +0100
message:
  Data entry, using uid to load multi org forms
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.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-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2013-12-17 19:50:35 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java	2013-12-21 16:50:48 +0000
@@ -111,9 +111,9 @@
         this.dataSetId = dataSetId;
     }
 
-    private Integer multiOrganisationUnit;
+    private String multiOrganisationUnit;
 
-    public void setMultiOrganisationUnit( Integer multiOrganisationUnit )
+    public void setMultiOrganisationUnit( String multiOrganisationUnit )
     {
         this.multiOrganisationUnit = multiOrganisationUnit;
     }
@@ -345,7 +345,7 @@
         // For multi-org unit we only support section forms
         // ---------------------------------------------------------------------
 
-        if ( multiOrganisationUnit != null && multiOrganisationUnit != 0 )
+        if ( multiOrganisationUnit != null )
         {
             OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( multiOrganisationUnit );
             List<OrganisationUnit> organisationUnitChildren = new ArrayList<OrganisationUnit>();