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

add org to permission team role

Browse Source 
related to #3326

* Reduce confusion when 2 teams with the same name, belonging to diff
orgs, are given permission to the same resource. The confusion is
eliminated by showing the org that a team role belongs to in the
tooltip.
This commit is contained in:
Chris Meyers
2017-01-17 13:22:47 -05:00
parent a8802f38aa
commit 768ddaed31
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/serializers.py
View File

@@ -1620,7 +1620,8 @@ class ResourceAccessListElementSerializer(UserSerializer):
'name': role.name, 'name': role.name,
'description': role.description, 'description': role.description,
'team_id': team_role.object_id, 'team_id': team_role.object_id,
'team_name': team_role.content_object.name 'team_name': team_role.content_object.name,
'team_organization_name': team_role.content_object.organization.name,
} }
if role.content_type is not None: if role.content_type is not None:
role_dict['resource_name'] = role.content_object.name role_dict['resource_name'] = role.content_object.name

2
awx/ui/client/src/access/rbac-role-column/roleList.partial.html
View File

@@ -9,7 +9,7 @@
<div class="RoleList-tag" <div class="RoleList-tag"
ng-class="{'RoleList-tag--deletable': entry.explicit && entry.user_capabilities.unattach, ng-class="{'RoleList-tag--deletable': entry.explicit && entry.user_capabilities.unattach,
'RoleList-tag--team': entry.team_id}" 'RoleList-tag--team': entry.team_id}"
aw-tool-tip='{{entry.team_name | sanitize}}' aw-tip-placement='bottom'> aw-tool-tip='<div>Organization: {{ entry.team_organization_name }}</div><div>Team: {{entry.team_name | sanitize}}</div>' aw-tip-placement='bottom'>
<span class="RoleList-name">{{ entry.name }}</span> <span class="RoleList-name">{{ entry.name }}</span>
<i ng-show='entry.team_id' class="fa fa-users"></i> <i ng-show='entry.team_id' class="fa fa-users"></i>
</div> </div>