Sync code3.0.0-ONAP1.2.0casablanca

Sync the code between repositories

Change-Id: Ic431c58c68716b6d401954fb854a183e0d222f57
Issue-ID: SDC-1874
Signed-off-by: Eran (ev672n), Vosk <ev672n@att.com>

1 files changed, 20 insertions, 14 deletions

diff --git a/app/main/dashboard/dcaedt/dcaedt.controller.js b/app/main/dashboard/dcaedt/dcaedt.controller.js
index 499a523..1ce7b09 100644
--- a/app/main/dashboard/dcaedt/dcaedt.controller.js
+++ b/app/main/dashboard/dcaedt/dcaedt.controller.js
@@ -8,24 +8,30 @@
         $scope.appSettings = appSettings;
 
         function init() {
-            if ($rootScope.VNFs === undefined) {
-                dcaeFactory
-                    .getVNFList()
-                    .then(function (response) {
-                        $rootScope.VNFs = response.data;
-                        $rootScope.VNFsRef = $rootScope.VNFs;
-                        $scope.title = appSettings.title;
-                        //var vm = this; vm.test = appSettings.title;
-                    }, function (res, status, headers, config) {
-                        errorHanlder(res);
-                        $rootScope.VNFs = [];
-                    });
-            }
+            $rootScope.loader = true;
+            $rootScope.VNFs = [];
+            dcaeFactory
+                .getVNFList()
+                .then(function (response) {
+                    $rootScope.VNFs = response.data;
+                    $rootScope.VNFsRef = $rootScope.VNFs;
+                    $scope.title = appSettings.title;
+                    $rootScope.loader = false;
+                    //var vm = this; vm.test = appSettings.title;
+                }, function (res, status, headers, config) {
+                    errorHanlder(res);
+                    $rootScope.VNFs = [];
+                    $rootScope.loader = false;
+                });
             $rootScope.$state = $state;
             $rootScope.$stateParams = $stateParams;
         }
 
-        init();
+        if ($state.current.url !== '/general') {
+            $rootScope.loader = false;
+            console.log($state.loader);
+            init();
+        }
 
         $scope.sortingVfcmts = function () {
             $rootScope.VNFs = $rootScope.VNFsRef;