diff options
| author |   Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-20 17:15:25 -0400 |
|---|---|---|
| committer | Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com> | 2018-03-23 11:44:23 -0400 |
| commit | 4ee8967d2429a8ff633693dd35f39eb26c022816 (patch) | |
| tree | 98db22e86d24dde967d2988d1f577306faa39445 /ecomp-portal-FE-common/client/app/views/role | |
| parent | dd5350525356a73410e0619b2e25722dd932f893 (diff) | |
Docker changes and Music Integration
Issue-ID: PORTAL-136, PORTAL-155, PORTAL-210,PORTAL-217
Includes JUNITS and docker changes, music integration and security fixes
Change-Id: Ib974401b48efc1f0d4f98036b0028043c3283691
Signed-off-by: Kishore Reddy, Gujja (kg811t) <kg811t@research.att.com>
Diffstat (limited to 'ecomp-portal-FE-common/client/app/views/role')
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js index 6475a83d..d06262b0 100644 --- a/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js +++ b/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js @@ -57,7 +57,9 @@ app.controller('roleCreateEditController',function($scope, conf, $http, $modalIn var availableRoleFunction = $scope.roleFunctions[i]; availableRoleFunction.selected = false; for(var j=0; j< $scope.role.roleFunctions.length; j++){ - if($scope.roleFunctions[i].code === $scope.role.roleFunctions[j].code) { + if($scope.roleFunctions[i].code === $scope.role.roleFunctions[j].code + && $scope.roleFunctions[i].type === $scope.role.roleFunctions[j].type + && $scope.roleFunctions[i].action === $scope.role.roleFunctions[j].action) { availableRoleFunction.selected = true; console.log(availableRoleFunction.selected); } @@ -77,7 +79,9 @@ app.controller('roleCreateEditController',function($scope, conf, $http, $modalIn if(!selected) { for(var i=0; i<$scope.finalSelectedRoleFunctions.length; i++){ var availableRoleFunction = $scope.finalSelectedRoleFunctions[i]; - if(availableRoleFunction.code == selectedRoleFunction.code){ + if(availableRoleFunction.code == selectedRoleFunction.code + && availableRoleFunction.type == selectedRoleFunction.type + && availableRoleFunction.action == selectedRoleFunction.action){ $scope.finalSelectedRoleFunctions.splice(i, 1); } } |