External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-12 11:57:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1662 from mabashian/1555-permissions-checkboxes

Browse Source 
Fixed permissions multi-select deselect bug
This commit is contained in:
Michael Abashian
2018-03-26 10:30:42 -04:00
committed by GitHub
parent b1e959bdaa bf142fa434
commit e486b16706
2 changed files with 1 additions and 5 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,6 +82,7 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr
scope.removeObject = function(obj){ scope.removeObject = function(obj){
let resourceType = scope.currentTab(); let resourceType = scope.currentTab();
delete scope.allSelected[resourceType][obj.id]; delete scope.allSelected[resourceType][obj.id];
obj.isSelected = false;
}; };
scope.toggleKeyPane = function() { scope.toggleKeyPane = function() {

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

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