External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 03:31:10 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed deselect team/user when adding permission

Browse Source
This commit is contained in:
mabashian
2017-08-28 15:06:17 -04:00
parent c2d59e4815
commit ffcab7e33b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/access/add-rbac-resource/rbac-resource.controller.js
View File

@@ -82,7 +82,6 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr
scope.removeObject = function(obj){
let resourceType = scope.currentTab();
delete scope.allSelected[resourceType][obj.id];
obj.isSelected = false;
};
scope.toggleKeyPane = function() {

5
awx/ui/client/src/access/rbac-multiselect/rbac-multiselect-list.directive.js
View File

@@ -138,6 +138,10 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
scope[`${list.iterator}_dataset`] = scope.dataset.data;
scope[`${list.name}`] = scope[`${list.iterator}_dataset`].results;
scope.$watch(`allSelected.${list.name}`, function(){
_.forEach(scope[`${list.name}`], isSelected);
}, true);
scope.$watch(list.name, function(){
_.forEach(scope[`${list.name}`], isSelected);
optionsRequestDataProcessing();
@@ -172,6 +176,7 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
}
function isSelected(item){
item.isSelected = false;
_.forEach(scope.allSelected[list.name], (selectedRow) => {
if(selectedRow.id === item.id) {
item.isSelected = true;