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

Fixed up AdHocCommandAccess to not use old Permission query

Browse Source
This commit is contained in:
Akita Noek
2016-03-16 11:21:19 -04:00
parent 60fcbd78f1
commit 8d439c9468
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awx/main/access.py
View File

@@ -944,21 +944,11 @@ class AdHocCommandAccess(BaseAccess):
return qs return qs
credential_ids = set(self.user.get_queryset(Credential).values_list('id', flat=True)) credential_ids = set(self.user.get_queryset(Credential).values_list('id', flat=True))
team_ids = set(Team.objects.filter(member_role__members=self.user).values_list('id', flat=True)) inventory_qs = Inventory.accessible_objects(self.user, {'read': True, 'execute': True})
permission_ids = set(Permission.objects.filter(
Q(user=self.user) | Q(team__in=team_ids),
permission_type__in=PERMISSION_TYPES_ALLOWING_INVENTORY_READ,
run_ad_hoc_commands=True,
).values_list('id', flat=True))
inventory_qs = self.user.get_queryset(Inventory)
inventory_qs = inventory_qs.filter(Q(permissions__in=permission_ids) | Q(organization__admins__in=[self.user]))
inventory_ids = set(inventory_qs.values_list('id', flat=True))
qs = qs.filter( qs = qs.filter(
credential_id__in=credential_ids, credential_id__in=credential_ids,
inventory_id__in=inventory_ids, inventory__in=inventory_qs,
) )
return qs return qs