fixing bugs connected with undefined parameters

Issue-ID: VID-488
Change-Id: I0099ec50d775bbae6bdbfa40de85decd839f21b3
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>

1 files changed, 8 insertions, 1 deletions

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;

                     }

                 }

             });