dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21857
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2016-02-03 10:30:21 +0700
message:
  bugfix for DataElementCategory.mergeWith, don't merge catcombos.. not owned by DataElementCategory
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.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-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java	2016-01-11 06:37:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategory.java	2016-02-03 03:30:21 +0000
@@ -269,10 +269,7 @@
             }
 
             removeAllCategoryOptions();
-            removeAllCategoryCombos();
-
             category.getCategoryOptions().forEach( this::addCategoryOption );
-            category.getCategoryCombos().forEach( this::addCategoryCombo );
         }
     }
 }