------------------------------------------------------------
revno: 20389
committer: Markus Bekken <markus.bek...@gmail.com>
branch nick: dhis2
timestamp: Mon 2015-09-28 15:08:36 +0200
message:
minor - display content of rule effect data if present
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js
--
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-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-09-24 14:38:58 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/registration/registration-controller.js 2015-09-28 13:08:36 +0000
@@ -268,7 +268,7 @@
if(effect.ineffect) {
var dialogOptions = {
headerText: 'validation_error',
- bodyText: effect.content
+ bodyText: effect.content + effect.data
};
DialogService.showDialog({}, dialogOptions);
$scope.selectedTei[effect.trackedEntityAttribute.id] = $scope.tei[effect.trackedEntityAttribute.id];
@@ -280,7 +280,7 @@
} else if (effect.action === "SHOWWARNING") {
if (effect.trackedEntityAttribute) {
if(effect.ineffect) {
- $scope.warningMessages.push(effect.content);
+ $scope.warningMessages.push(effect.content + effect.data);
}
}
else {
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
