External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-09 15:28:05 -02:30
Code Issues Packages Projects Releases Wiki Activity

Handle cascading mark inactive in better ways as per rbac spec

Browse Source 
specifically around Teams and Credentials
This commit is contained in:
Matthew Jones
2014-07-24 15:19:53 -04:00
parent 20d76bfc91
commit 695df551e7
4 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/access.py
View File

@@ -258,8 +258,8 @@ class InventoryAccess(BaseAccess):
qs = qs.select_related('created_by', 'organization')
if self.user.is_superuser:
return qs
admin_of = qs.filter(organization__admins__in=[self.user],
organization__active=True).distinct()
qs = qs.filter(organization__active=True)
admin_of = qs.filter(organization__admins__in=[self.user]).distinct()
has_user_perms = qs.filter(
permissions__user__in=[self.user],
permissions__permission_type__in=allowed,