From 076a91ea6d000ce8d9d76c94d5d6b01f6ba373d3 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Tue, 15 Mar 2016 09:07:35 -0400 Subject: [PATCH] Test fixup and InventorySource fixup --- awx/main/access.py | 6 ++++-- awx/main/tests/old/jobs/jobs_monolithic.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index d7c187aed4..cb52b4524d 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -487,9 +487,11 @@ class InventorySourceAccess(BaseAccess): model = InventorySource def get_queryset(self): - qs = self.model.accessible_by(self.user, {'read':True}) + qs = self.model.objects qs = qs.select_related('created_by', 'modified_by', 'group', 'inventory') - return qs + inventory_ids = set(self.user.get_queryset(Inventory).values_list('id', flat=True)) + return qs.filter(Q(inventory_id__in=inventory_ids) | + Q(group__inventory_id__in=inventory_ids)) def can_read(self, obj): if obj and obj.group: diff --git a/awx/main/tests/old/jobs/jobs_monolithic.py b/awx/main/tests/old/jobs/jobs_monolithic.py index 9286b93084..a42eb2dfaa 100644 --- a/awx/main/tests/old/jobs/jobs_monolithic.py +++ b/awx/main/tests/old/jobs/jobs_monolithic.py @@ -265,7 +265,7 @@ class JobTemplateTest(BaseJobTestMixin, django.test.TransactionTestCase): # Chuck is temporarily assigned to ops east team to help them running some playbooks # even though he's in a different group and org entirely he'll now see their job templates - self.team_ops_east.users.add(self.user_chuck) + self.team_ops_east.deprecated_users.add(self.user_chuck) with self.current_user(self.user_chuck): resp = self.get(url, expect=200) #print [x['name'] for x in resp['results']]