=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-11-28 20:52:27 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSet.java 2013-12-09 14:33:53 +0000 @@ -378,6 +378,24 @@ compulsoryDataElementOperands.remove( dataElementOperand ); } + /** + * Returns all organisation units assigned to this data set, including + * org units assigned directly and organisation units assigned through groups. + */ + public Set getAllOrganisationUnits() + { + Set units = new HashSet(); + + units.addAll( sources ); + + for ( OrganisationUnitGroup group : organisationUnitGroups ) + { + units.addAll( group.getMembers() ); + } + + return units; + } + public boolean hasDataEntryForm() { return dataEntryForm != null;