External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2596 from jlmitch5/fixPermIssue

Browse Source 
fix permission issue with regular user jt admins

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2018-11-06 16:40:58 +00:00
committed by GitHub
parent afe07bd874 da7834476b
commit 5860689619
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,10 +45,10 @@
</div>
<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 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>
<span ng-show="hasSelectedRows()">

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

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

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

@@ -16,7 +16,8 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
scope: {
allSelected: '=',
view: '@',
dataset: '='
dataset: '=',
objectType: '='
},
template: "<div class='addPermissionsList-inner'></div>",
link: function(scope, element, attrs, ctrl) {
@@ -170,7 +171,7 @@ export default ['addPermissionsTeamsList', 'addPermissionsUsersList', 'TemplateL
// which is intended here.
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');
}
});