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

fix permission issue where regular users assigned jt admin could not add user jt roles they couldn't edit

Browse Source
This commit is contained in:
John Mitchell
2018-11-05 16:45:35 -05:00
parent 049d642df8
commit 8645602b0a
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.directive.js
View File

@@ -29,6 +29,8 @@ export default ['templateUrl', '$state',
}; };
window.scrollTo(0, 0); window.scrollTo(0, 0);
scope.objectType = scope.object.type;
} }
}; };
} }

4
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@@ -45,10 +45,10 @@
</div> </div>
<div id="AddPermissions-users" class="AddPermissions-list" ng-show="tab.users"> <div id="AddPermissions-users" class="AddPermissions-list" ng-show="tab.users">
<rbac-multiselect-list view="Users" all-selected="allSelected" dataset="usersDataset"></rbac-multiselect-list> <rbac-multiselect-list view="Users" all-selected="allSelected" dataset="usersDataset" object-type="object.type"></rbac-multiselect-list>
</div> </div>
<div id="AddPermissions-teams" class="AddPermissions-list" ng-if="tab.teams"> <div id="AddPermissions-teams" class="AddPermissions-list" ng-if="tab.teams">
<rbac-multiselect-list view="Teams" all-selected="allSelected" dataset="teamsDataset"></rbac-multiselect-list> <rbac-multiselect-list view="Teams" all-selected="allSelected" dataset="teamsDataset" object-type="object.type"></rbac-multiselect-list>
</div> </div>
<span ng-show="hasSelectedRows()"> <span ng-show="hasSelectedRows()">

4
awx/ui/client/src/access/rbac-multiselect/permissionsUsers.list.js
View File

@@ -16,8 +16,8 @@
index: false, index: false,
hover: true, hover: true,
emptyListText : i18n._('No Users exist'), emptyListText : i18n._('No Users exist'),
disableRow: "{{ user.summary_fields.user_capabilities.edit === false }}", disableRow: "{{ objectType === 'organization' && user.summary_fields.user_capabilities.edit === false }}",
disableRowValue: "user.summary_fields.user_capabilities.edit === false", disableRowValue: "objectType === 'organization' && user.summary_fields.user_capabilities.edit === false",
disableTooltip: { disableTooltip: {
placement: 'top', placement: 'top',
tipWatch: 'user.tooltip' tipWatch: 'user.tooltip'

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

@@ -16,7 +16,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
scope: { scope: {
allSelected: '=', allSelected: '=',
view: '@', view: '@',
dataset: '=' dataset: '=',
objectType: '='
}, },
template: "<div class='addPermissionsList-inner'></div>", template: "<div class='addPermissionsList-inner'></div>",
link: function(scope, element, attrs, ctrl) { link: function(scope, element, attrs, ctrl) {
@@ -39,6 +40,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
delete list.actions; delete list.actions;
delete list.fieldActions; delete list.fieldActions;
console.log(scope.objectType);
switch(scope.view){ switch(scope.view){
case 'Projects': case 'Projects':
@@ -170,7 +173,7 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
// which is intended here. // which is intended here.
itm.tooltip = undefined; itm.tooltip = undefined;
} }
else if(!itm.summary_fields.user_capabilities.edit){ else if(scope.objectType === 'organization' && !itm.summary_fields.user_capabilities.edit){
itm.tooltip = i18n._('You do not have permission to manage this user'); itm.tooltip = i18n._('You do not have permission to manage this user');
} }
}); });