diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-31 15:16:38 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-08-31 15:42:50 -0400 |
| commit | 7f535078ef80a7b7efa3e3325bfccb994fbd00e8 (patch) | |
| tree | 66d908df2eb7cf0b048f754eac6b44619255eb8a /ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js | |
| parent | 224487bc124df7988442a60d72d4aa106697306b (diff) | |
Rename packages to org.onap in 1.4.0-SNAPSHOT
19 - remove openecomp
72 - remediate Sonar scan issues
79 - removed unwanted left menu under Report
90 - apply approved license text
Issue: PORTAL-19, PORTAL-72, PORTAL-79, PORTAL-90
Change-Id: I41a0ef5fba623d2242574bd15f2d9fb8029a496c
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js')
| -rw-r--r-- | ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js index dc59b6c7..0c6105c8 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js @@ -106,7 +106,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal var message = msg; $scope.cancel(); if(message.role){ - $rootScope.$broadcast('updateRoleFunctions',{data:message.role}); + $rootScope.$broadcast('updateRoleFunctions',{data:message.role,removedRoleFunc: roleFunction.name}); }else{ $modal.open({ templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html', @@ -718,6 +718,12 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal // updating role functions on roles page after deletion of a role function $rootScope.$on('updateRoleFunctions',function(e,d){ $scope.role = d.data; + if (typeof d.removedRoleFunc != 'undefined' && d.removedRoleFunc!=''){ + for(var i=0;i<$scope.ociavailableRoleFunctions.length;i++){ + if($scope.ociavailableRoleFunctions[i].name==d.removedRoleFunc) + $scope.ociavailableRoleFunctions[i].selected=false; + } + } }) $scope.roleFnInit(); @@ -824,7 +830,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html', controller: ModalInstanceCtrl, sizeClass: 'modal-large', - windowClass:"modal-docked", resolve: { items: function () { var message = { |