remove FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE

[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 4b6b0f4..12dd779 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
@@ -361,24 +361,14 @@
 \r
             populate_popup_vfModule(serviceObject, vfModule, vnf);\r
 \r
-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE))  {\r
-\r
-                if (DataService.getLoggedInUserId())  {\r
-                    openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
-                }\r
-                else {\r
-                    AaiService.getLoggedInUserID(function (response) {\r
-                        var userID = response.data;\r
-                        DataService.setLoggedInUserId(userID);\r
-                        openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
-                    });\r
-                }\r
+            if (DataService.getLoggedInUserId())  {\r
+                openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
             }\r
             else {\r
-                $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
-                    componentId: COMPONENT.VF_MODULE,\r
-                    callbackFunction: deleteOrResumeCallback,\r
-                    dialogMethod: COMPONENT.DELETE\r
+                AaiService.getLoggedInUserID(function (response) {\r
+                    var userID = response.data;\r
+                    DataService.setLoggedInUserId(userID);\r
+                    openVfModuleWithHomingDataModal(COMPONENT.DELETE, vfModule);\r
                 });\r
             }\r
             console.log("Removing VF-Module", vfModule);\r
@@ -1245,25 +1235,14 @@
             DataService.setVfModuleInstanceName(vfModule.object[FIELD.ID.VF_MODULE_NAME]);\r
             setCurrentServiceModelInfoFromScope();\r
 \r
-            if (featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE))  {\r
-\r
-                if (DataService.getLoggedInUserId())  {\r
-                    openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
-                }\r
-                else {\r
-                    AaiService.getLoggedInUserID(function (response) {\r
-                        var userID = response.data;\r
-                        DataService.setLoggedInUserId(userID);\r
-                        openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
-                    });\r
-                }\r
+            if (DataService.getLoggedInUserId())  {\r
+                openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
             }\r
             else {\r
-                $scope.$broadcast(COMPONENT.DELETE_RESUME_COMPONENT, {\r
-                    componentId: COMPONENT.VF_MODULE,\r
-                    volumeGroups: vfModule.volumeGroups,\r
-                    callbackFunction: deleteOrResumeCallback,\r
-                    dialogMethod: COMPONENT.RESUME\r
+                AaiService.getLoggedInUserID(function (response) {\r
+                    var userID = response.data;\r
+                    DataService.setLoggedInUserId(userID);\r
+                    openVfModuleWithHomingDataModal(COMPONENT.RESUME, vfModule);\r
                 });\r
             }\r
         };\r