dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20560
committer: Markus Bekken <markus.bekken@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-10-07 10:51:26 +0200
message:
  Including dynamic part of error and warning messages where present
modified:
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js
  dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-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-event-capture/scripts/controllers.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-10-01 10:07:00 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-capture/scripts/controllers.js	2015-10-07 08:51:26 +0000
@@ -1027,14 +1027,14 @@
                     if(effect.action === "SHOWERROR" && effect.dataElement.id){
                         var dialogOptions = {
                             headerText: 'validation_error',
-                            bodyText: effect.content
+                            bodyText: effect.content + effect.data
                         };
                         DialogService.showDialog({}, dialogOptions);
             
                         $scope.currentEvent[effect.dataElement.id] = $scope.currentEventOriginialValue[effect.dataElement.id];
                     }
                     if(effect.action === "SHOWWARNING"){
-                        $scope.warningMessages.push(effect.content);
+                        $scope.warningMessages.push(effect.content + effect.data);
                     }
                 }
             });

=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-06 15:14:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-tracker-capture/components/dataentry/dataentry-controller.js	2015-10-07 08:51:26 +0000
@@ -120,7 +120,7 @@
                     if (effect.dataElement) {
                         
                         if(effect.ineffect) {
-                            $scope.errorMessages[effect.dataElement.id] = effect.content;
+                            $scope.errorMessages[effect.dataElement.id] = effect.content + effect.data;
                         } else {
                             $scope.errorMessages[effect.dataElement.id] = false;
                         }
@@ -131,7 +131,7 @@
                 } else if (effect.action === "SHOWWARNING") {
                     if (effect.dataElement) {
                         if(effect.ineffect) {
-                            $scope.warningMessages[effect.dataElement.id] = effect.content;
+                            $scope.warningMessages[effect.dataElement.id] = effect.content + effect.data;
                         } else {
                             $scope.warningMessages[effect.dataElement.id] = false;
                         }