Add flag flag_flash_more_actions_button_in_old_view_edit

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / InstantiationController.js

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 6eed080..b3afcd8 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -142,13 +142,13 @@
 \r
             }\r
             return null;\r
-        }\r
+        };\r
         $scope.hasVfModules = function (vnfInstance) {\r
             if ($scope.returnVfModules(vnfInstance) != null) {\r
                 return true;\r
             }\r
             return false;\r
-        }\r
+        };\r
         $scope.returnVolumeGroups = function (vnfInstance) {\r
 \r
             var svcModel = $scope.service.convertedModel;\r
@@ -183,13 +183,13 @@
 \r
             }\r
             return null;\r
-        }\r
+        };\r
         $scope.hasVolumeGroups = function (vnfInstance) {\r
             if ($scope.returnVolumeGroups(vnfInstance) != null) {\r
                 return true;\r
             }\r
             return false;\r
-        }\r
+        };\r
         $scope.deleteNetwork = function (serviceObject, network) {\r
 \r
             console.log("Removing Network " + network.name);\r
@@ -225,12 +225,20 @@
         };\r
 \r
         $scope.allowTransferToNewScreenAndShowButton = function (){\r
-          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_REPLACE_VF_MODULE)) {\r
-              return $scope.isPermitted && !($scope.isMacro());\r
+          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT)) {\r
+              return $scope.isPermitted;\r
           }\r
           return false;\r
         };\r
 \r
+        $scope.navigateToNewEditViewScreen = function(){\r
+                window.location.href = 'serviceModels.htm#/servicePlanning/EDIT?' +\r
+                    'serviceModelId=' +     _.get($scope, 'service.model.service.uuid') +\r
+                    '&subscriberId=' +      $location.search().subscriberId  +\r
+                    '&serviceType=' +       $location.search().serviceType      +\r
+                    '&serviceInstanceId=' + $location.search().serviceInstanceId;\r
+        };\r
+\r
         $scope.deleteService = function (serviceObject, serviceOrchestrationStatus) {\r
 \r
             var serviceInstance = serviceObject.object;\r
@@ -871,7 +879,7 @@
 \r
             //Display popup with additional VF-Module information\r
             DataService.setVfModuleInstanceId(vfModule[FIELD.ID.VF_MODULE_ID]);\r
-            DataService.setInventoryItem(vfModule)\r
+            DataService.setInventoryItem(vfModule);\r
 \r
             DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);\r
             DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);\r
@@ -1323,7 +1331,7 @@
 \r
         var deleteCallbackFunction = function () {\r
             console.log('hi')\r
-        }\r
+        };\r
 \r
         $scope.resetProgress = function () {\r
             $scope.percentProgress = 0;\r
@@ -1364,13 +1372,13 @@
             else {\r
                 return true;\r
             }\r
-        }\r
+        };\r
         $scope.isMacro = function () {\r
             return $scope.service && AsdcService.isMacro($scope.service.model);\r
-        }\r
+        };\r
         $scope.reloadRoute = function () {\r
             $route.reload();\r
-        }\r
+        };\r
 \r
 \r
         /*\r
@@ -1539,7 +1547,7 @@ Private metthods
                     + FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;\r
                 if (response.isSuccessful) {\r
                     color = FIELD.ID.COLOR_8F8;\r
-                    $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH)\r
+                    $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH);\r
                 } else {\r
                     color = FIELD.ID.COLOR_F88;\r
                 }\r