Merge "edit of macro services in new view edit screen"

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
index a460130..eb44647 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/fieldConstants.js
@@ -295,7 +295,7 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         PRIMARY: "primary",\r
         PROGRESS_BAR_INFO: "progress-bar progress-bar-info",\r
         PROGRESS_BAR_SUCCESS: "progress-bar progress-bar-success",\r
-    }\r
+    };\r
 \r
     var ERROR = {\r
         AAI: "A&AI failure - see log below for details",\r
@@ -322,7 +322,7 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         INVALID_DATA_FORMAT: 'Invalid data format.Please check your file content whether it is not in json or not.',\r
         MISSING_FILE: 'Please Select JSON File.',\r
 \r
-    }\r
+    };\r
 \r
     /*\r
      * PARAMETER values indicate field configurations that are provided to\r
@@ -512,5 +512,5 @@ appDS2.factory("FIELD", ["PARAMETER", function (PARAMETER) {
         STATUS: STATUS,\r
         STYLE: STYLE,\r
         ERROR: ERROR\r
-    }\r
+    };\r
 }]);\r

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/change-management.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/change-management.controller.js
index 10a3e67..d58bf49 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/change-management.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/change-management.controller.js
@@ -38,18 +38,18 @@
 
         var fuseMsoAndSchedulerTaks = function() {
             if (vm.changeManagements && vm.pendingChangeManagements) {
-                var requestIdToVnfName = {}
+                var requestIdToVnfName = {};
                 vm.pendingChangeManagements.forEach(function(schedulerItem) {
                     if (schedulerItem.msoRequestId && schedulerItem.vnfName) {
                         requestIdToVnfName[schedulerItem.msoRequestId] = schedulerItem.vnfName;
                     }
-                })
+                });
                 $log.debug("requestIdToVnfName", requestIdToVnfName);
 
                 vm.changeManagements = vm.changeManagements.map(function(msoItem) {
                     msoItem['vnfNameFromScheduler'] = requestIdToVnfName[msoItem.requestId];
                     return msoItem;
-                })
+                });
             }
         };
 
@@ -109,7 +109,7 @@
         };
 
         vm.searchChanges = function() {
-            console.log("function for searching changes: " + vm.searchChangesTerm)
+            console.log("function for searching changes: " + vm.searchChangesTerm);
         };
 
 
@@ -141,19 +141,19 @@
         vm.openFailedModal = function($event, jobInfo) {
             vm.openManualTasksPopup($event, jobInfo,
                 'app/vid/scripts/modals/failed-change-management/failed-change-management.html',
-                "This is the result of the failed change management modal.")
+                "This is the result of the failed change management modal.");
         };
 
         vm.openInProgressModal = function($event, jobInfo) {
             vm.openManualTasksPopup($event, jobInfo,
                 'app/vid/scripts/modals/in-progress-modal-management/in-progress-change-management.html',
-                "This is the result of the in progress change management modal.")
+                "This is the result of the in progress change management modal.");
         };
 
         vm.openAlertModal = function($event, jobInfo) {
             vm.openManualTasksPopup($event, jobInfo,
                 'app/vid/scripts/modals/alert-change-management/alert-change-management.html',
-                "This is the result of the alert change management modal.")
+                "This is the result of the alert change management modal.");
         };
 
         vm.openBasicAlertModal = function(jobInfo) {
@@ -231,7 +231,7 @@
                 vm.currModal.close();
                 vm.currModal = null;
             }
-        }
+        };
 
 
         vm.init();

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
index 9abcb42..1571713 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/detailsDialogController.js
@@ -61,12 +61,12 @@ var detailsDialogController = function($scope, $http, $timeout, $log,
            $scope.log = MsoService.getFormattedCommonResponse(response);\r
            MsoService.showResponseContentError(error, showError);\r
        }\r
-    }\r
+    };\r
 \r
     $scope.close = function() {\r
        $scope.isDialogVisible = false;\r
        $scope.popup.isVisible = false;\r
-    }\r
+    };\r
 \r
     var showError = function(summary, details) {\r
        var message = summary;\r
@@ -76,8 +76,8 @@ var detailsDialogController = function($scope, $http, $timeout, $log,
        $scope.isSpinnerVisible = false;\r
        $scope.isErrorVisible = true;\r
        $scope.error = message;\r
-    }\r
-}\r
+    };\r
+};\r
 \r
 appDS2.controller("detailsDialogController", [ "$scope", "$http", "$timeout",\r
        "$log", "MsoService", "DetailsService", "UtilityService", "COMPONENT", "FIELD",\r