=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js' --- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-12-03 22:41:49 +0000 +++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-12-06 21:59:21 +0000 @@ -299,7 +299,9 @@ } else if (effect.action === "SHOWWARNING") { if (effect.trackedEntityAttribute) { if(effect.ineffect) { - $scope.warningMessages.push(effect.content + (effect.data ? effect.data : "")); + var message = effect.content + (angular.isDefined(effect.data) ? effect.data : ""); + $scope.warningMessages.push(message); + $scope.warningMessages[effect.trackedEntityAttribute.id] = message; } } else {