=== 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} )",