External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-12 15:14:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Made it so org auditors can see all users if ORG_ADMINS_CAN_SEE_ALL_USERS is true

Browse Source 
Addresses #2706
This commit is contained in:
Akita Noek
2016-07-07 09:22:36 -04:00
parent b6ec87f18a
commit a42986894f
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/access.py
View File

@@ -224,7 +224,8 @@ class UserAccess(BaseAccess):
if self.user.is_superuser: if self.user.is_superuser:
return User.objects.all() return User.objects.all()
if tower_settings.ORG_ADMINS_CAN_SEE_ALL_USERS and self.user.admin_of_organizations.exists(): if tower_settings.ORG_ADMINS_CAN_SEE_ALL_USERS and \
(self.user.admin_of_organizations.exists() or self.user.auditor_of_organizations.exists()):
return User.objects.all() return User.objects.all()
return ( return (

6
awx/main/models/__init__.py
View File

@@ -48,12 +48,18 @@ User.add_to_class('admin_role', user_admin_role)
@property @property
def user_get_organizations(user): def user_get_organizations(user):
return Organization.objects.filter(member_role__members=user) return Organization.objects.filter(member_role__members=user)
@property @property
def user_get_admin_of_organizations(user): def user_get_admin_of_organizations(user):
return Organization.objects.filter(admin_role__members=user) return Organization.objects.filter(admin_role__members=user)
@property
def user_get_auditor_of_organizations(user):
return Organization.objects.filter(auditor_role__members=user)
User.add_to_class('organizations', user_get_organizations) User.add_to_class('organizations', user_get_organizations)
User.add_to_class('admin_of_organizations', user_get_admin_of_organizations) User.add_to_class('admin_of_organizations', user_get_admin_of_organizations)
User.add_to_class('auditor_of_organizations', user_get_auditor_of_organizations)
@property @property
def user_is_system_auditor(user): def user_is_system_auditor(user):