X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Frole%2Frole-list-controller.js;h=8765149e6505ff471e7b9dd77c50e493764d7988;hb=012d8970a7e08b2397b7b90d0a293118e254b021;hp=6f280313c940b0a164d1c643aeb7249cc0a21f2c;hpb=a70761c096192e38800bf38d6c7f61f52bf72007;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
index 6f280313..8765149e 100644
--- a/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
+++ b/ecomp-portal-FE-common/client/app/views/role/role-list-controller.js
@@ -152,11 +152,9 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
             	   $scope.centralizedApps = res;
             	   for(var i = 0; i<res.length; i++){
             		      if(res[i].appId == 1){
-            		    	  $scope.getRolesForSelectedCentralizedApp(res[i].appId);
             		    	  $scope.apps.selectedCentralizedApp = res[i].appId;
             		    	  return;
             		      }  
-            		      $scope.getRolesForSelectedCentralizedApp(res[0].appId);
             		      $scope.apps.selectedCentralizedApp = res[0].appId;
             	   }
                 }
@@ -219,11 +217,13 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 		
 		// edit Role
 		$scope.editRoleModalPopup = function(appId, availableRole) {
+			$scope.showSpinner = true;
 			if(!availableRole.active)
 				 return confirmBoxService.showInformation('Edit is diabled! Please toggle the role to activate it.').then(isConfirmed => {});
 			$scope.editRole = availableRole;
 			if(appId != undefined && availableRole.id != undefined){
-				RoleService.getRole(appId, availableRole.id).then(function(data){	
+				RoleService.getRole(appId, availableRole.id).then(function(data){
+					$scope.showSpinner = false;
 					var response = JSON.parse(data.data);					
 					var role = JSON.parse(response.role);
 					var availableRoles = JSON.parse(response.availableRoles);
@@ -253,6 +253,7 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 					});
 				},function(error){
 					$log.debug('Failed to editRole');
+					$scope.showSpinner = false;
 				});
 			}
 			 
@@ -260,9 +261,11 @@ app.controller('roleListController', function ($scope,RoleService, applicationsS
 		
 		// add Role
 		$scope.addRoleModalPopup = function(appId) {
+			$scope.showSpinner = true;
 			if(appId){
 				var roleId = -1;
 				RoleService.getRole(appId, roleId).then(function(data){	
+					$scope.showSpinner = false;
 					var response = JSON.parse(data.data);					
 					var role = JSON.parse(response.role);
 					var availableRoles = JSON.parse(response.availableRoles);