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

ensure the singleton roles show up for sys auditor / sys admins

Browse Source
This commit is contained in:
Wayne Witzel III
2016-06-30 10:55:54 -04:00
parent c0ef749c64
commit 47893613a2
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/api/views.py
View File

@@ -1192,6 +1192,13 @@ class UserRolesList(SubListCreateAttachDetachAPIView):
if not self.request.user.can_access(User, 'read', u): if not self.request.user.can_access(User, 'read', u):
raise PermissionDenied() raise PermissionDenied()
content_type = ContentType.objects.get_for_model(User) content_type = ContentType.objects.get_for_model(User)
sys_admin = Role.singleton(ROLE_SINGLETON_SYSTEM_ADMINISTRATOR)
sys_audit = Role.singleton(ROLE_SINGLETON_SYSTEM_AUDITOR)
if self.request.user in sys_admin or self.request.user in sys_audit:
return u.roles.all().exclude(content_type=content_type, object_id=u.id)
return Role.filter_visible_roles(self.request.user, u.roles.all()) \ return Role.filter_visible_roles(self.request.user, u.roles.all()) \
.exclude(content_type=content_type, object_id=u.id) .exclude(content_type=content_type, object_id=u.id)