← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20007: minor fix

 

------------------------------------------------------------
revno: 20007
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-09-07 09:52:33 +0700
message:
  minor fix
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm


--
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-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2015-09-03 09:45:19 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElement.vm	2015-09-07 02:52:33 +0000
@@ -7,8 +7,7 @@
     "shortName": "$!encoder.jsonEncode( ${dataElement.displayShortName} )",
     "code": "$!encoder.jsonEncode( ${dataElement.code} )",
     "description": "$!encoder.jsonEncode( ${dataElement.displayDescription} )",
-    "type": "$!{dataElement.type}",
-    "valueType": "$!{dataElement.type}",
+    "valueType": "$!{dataElement.valueType}",
     "domainType": "${dataElement.getDomainTypeNullSafe()}",
     "aggregationOperator": "$!{dataElement.aggregationOperator}",
     "categoryCombo": "$!encoder.xmlEncode( ${dataElement.categoryCombo.name} )",