=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2013-12-09 21:32:59 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2013-12-12 15:26:13 +0000
@@ -584,8 +584,7 @@
 
         if ( currentUser != null && !currentUser.getUserCredentials().isSuper() )
         {
-            Collection<Integer> userDataSets = ConversionUtils.getIdentifiers( DataSet.class, currentUser
-                .getUserCredentials().getAllDataSets() );
+            Collection<String> userDataSets = ConversionUtils.getUids( DataSet.class, currentUser.getUserCredentials().getAllDataSets() );
 
             for ( Set<String> dataSets : associationMap.values() )
             {
@@ -603,8 +602,6 @@
             Collection<String> parentIds = ConversionUtils.getUids( OrganisationUnit.class,
                 currentUser.getOrganisationUnits() );
 
-            // Collection<Integer> children = getOrganisationUnitHierarchy().getChildren( parentIds );
-
             Collection<OrganisationUnit> organisationUnitsWithChildren = getOrganisationUnitsWithChildren( parentIds );
             Collection<String> children = ConversionUtils.getUids( OrganisationUnit.class, organisationUnitsWithChildren );