dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19925
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-09-02 12:21:56 +0700
message:
  support de.valueType mergeWith
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.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/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-02 05:15:31 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java	2015-09-02 05:21:56 +0000
@@ -836,6 +836,7 @@
                 type = dataElement.getType();
                 numberType = dataElement.getNumberType();
                 textType = dataElement.getTextType();
+                valueType = dataElement.getValueType();
                 aggregationOperator = dataElement.getAggregationOperator();
                 categoryCombo = dataElement.getCategoryCombo();
                 url = dataElement.getUrl();
@@ -849,6 +850,7 @@
                 type = dataElement.getType() == null ? type : dataElement.getType();
                 numberType = dataElement.getNumberType() == null ? numberType : dataElement.getNumberType();
                 textType = dataElement.getTextType() == null ? textType : dataElement.getTextType();
+                valueType = dataElement.getValueType() == null ? valueType : dataElement.getValueType();
                 aggregationOperator = dataElement.getAggregationOperator() == null ? aggregationOperator : dataElement.getAggregationOperator();
                 categoryCombo = dataElement.getCategoryCombo() == null ? categoryCombo : dataElement.getCategoryCombo();
                 url = dataElement.getUrl() == null ? url : dataElement.getUrl();