From 8cc08f1d0796da5f759a3b90bc08427e9598ef74 Mon Sep 17 00:00:00 2001 From: Bartosz Gardziejewski Date: Fri, 19 Jul 2019 15:29:11 +0200 Subject: fixing bugs connected with undefined parameters Issue-ID: VID-488 Change-Id: I0099ec50d775bbae6bdbfa40de85decd839f21b3 Signed-off-by: Bartosz Gardziejewski --- .../webapp/app/vid/scripts/controller/aaiSubscriberController.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js index ed03e3aec..072adf305 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js @@ -25,6 +25,13 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", function (COMPONENT, FIELD, PARAMETER, DataService, PropertyService, $scope, $http, $timeout, $location, $log, $route, $uibModal, VIDCONFIGURATION, UtilityService, vidService, AaiService, MsoService, OwningEntityService, AsdcService, featureFlags, $q, _) { $scope.showReportWindow = function() { + let GuiMessage; + + if ($scope.errorMsg !== undefined && $scope.errorMsg !== null) { + GuiMessage = $scope.errorMsg; + } else { + GuiMessage = $scope.status; + } const modalWindow = $uibModal.open({ templateUrl: 'app/vid/scripts/modals/report-modal/report-modal.html', @@ -32,7 +39,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", controllerAs: 'vm', resolve: { errorMsg: function () { - return $scope.errorMsg; + return GuiMessage; } } }); -- cgit 1.2.3-korg