=== 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 2012-11-30 15:43:14 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2012-12-01 12:12:01 +0000 @@ -309,19 +309,24 @@ if ( multiOrganisationUnit != null && multiOrganisationUnit != 0 ) // for multiOrg, we only support section forms { OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( multiOrganisationUnit ); + List organisationUnitChildren = new ArrayList(); + + for ( OrganisationUnit child : organisationUnit.getChildren() ) + { + if ( child.getDataSets().contains( dataSet ) ) + { + organisationUnitChildren.add( child ); + } + } + + Collections.sort( organisationUnitChildren, IdentifiableObjectNameComparator.INSTANCE ); if ( organisationUnit.getDataSets().contains( dataSet ) ) { organisationUnits.add( organisationUnit ); } - for ( OrganisationUnit child : organisationUnit.getChildren() ) - { - if ( child.getDataSets().contains( dataSet ) ) - { - organisationUnits.add( child ); - } - } + organisationUnits.addAll( organisationUnitChildren ); getSectionForm( dataElements, dataSet ); displayMode = "multiorg_section";