remove FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE

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

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index 62ef1a4..b29680f 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -64,7 +64,8 @@
                     $scope.currentPageNum=1;\r
                     $scope.isSpinnerVisible = false;\r
                     $scope.isProgressVisible = false;\r
-                    if (sessionStorage.getItem("searchKey")!='undefined' && ($scope.rememberFilter)) {\r
+                                       var searchKey = sessionStorage.getItem("searchKey");\r
+                    if (searchKey != 'undefined' && searchKey!=null && ($scope.rememberFilter)) {\r
                         var searchKey = JSON.parse(sessionStorage.getItem("searchKey"));\r
                         $scope.searchString = searchKey.searchString || '';\r
                         $scope.viewPerPage = searchKey.viewPerPage || defaultViewPerPage;\r
@@ -88,6 +89,10 @@
                        });\r
                };\r
 \r
+               $scope.isShowOrchestrationType = function() {\r
+                       return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_ORCHESTRATION_TYPE);\r
+               };\r
+\r
                var wholeData=[];\r
 \r
                $scope.filterDataWithHigherVersion = function(serviceData){\r
@@ -206,7 +211,7 @@
                     DataService.setShouldIncludeInAsyncInstantiationFlow(shouldTakeTheAsyncInstantiationFlow);\r
 \r
                     DataService.setALaCarte (true);\r
-          DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));\r
+                    DataService.setPnf(!angular.equals(serviceModel.pnfs, {}));\r
                                        $scope.createType = COMPONENT.A_LA_CARTE;\r
                                        var broadcastType = COMPONENT.CREATE_COMPONENT;\r
                     if (AsdcService.isMacro(serviceModel) || DataService.getE2EService()) {\r