=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java' --- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-02-12 15:22:28 +0000 +++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java 2014-02-21 12:35:04 +0000 @@ -238,13 +238,13 @@ // Create table // --------------------------------------------------------------------- - List groupSets = new ArrayList(); - - Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE ); - List categoryOptionCombos = new ArrayList( categoryService.getAllDataElementCategoryOptionCombos() ); + List groupSets = new ArrayList( categoryService.getAllCategoryOptionGroupSets() ); + + Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE ); + resourceTableStore.createCategoryOptionGroupSetStructure( groupSets ); // ---------------------------------------------------------------------