=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-09-06 18:14:06 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.angular.services.js 2015-09-07 07:55:07 +0000
@@ -925,7 +925,9 @@
if(!valueFound) {
if(attribute.attribute === programVariable.trackedEntityAttribute.id) {
valueFound = true;
- variables = pushVariable(variables, programVariable.name, attribute.value, attribute.valueType, valueFound, 'A' );
+ //In registration, the attribute type is found in .type, while in data entry the same data is found in .valueType.
+ //Handling here, but planning refactor in registration so it will always be .valueType
+ variables = pushVariable(variables, programVariable.name, attribute.value, attribute.type ? attribute.type : attribute.valueType, valueFound, 'A' );
}
}
});