Code Review
/
portal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Docker changes and Music Integration
[portal.git]
/
ecomp-portal-FE-common
/
client
/
app
/
views
/
role
/
role-create-edit-popup-controller.js
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
6475a83
..
d06262b
100644
(file)
--- 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++){
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);
}
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(!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);
}
}
$scope.finalSelectedRoleFunctions.splice(i, 1);
}
}