dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 14088
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-02-21 13:35:04 +0100
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.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-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<CategoryOptionGroupSet> groupSets = new ArrayList<CategoryOptionGroupSet>();
-        
-        Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
-
         List<DataElementCategoryOptionCombo> categoryOptionCombos = 
             new ArrayList<DataElementCategoryOptionCombo>( categoryService.getAllDataElementCategoryOptionCombos() );
         
+        List<CategoryOptionGroupSet> groupSets = new ArrayList<CategoryOptionGroupSet>( categoryService.getAllCategoryOptionGroupSets() );
+        
+        Collections.sort( groupSets, IdentifiableObjectNameComparator.INSTANCE );
+
         resourceTableStore.createCategoryOptionGroupSetStructure( groupSets );
 
         // ---------------------------------------------------------------------