From c9b0625e39dfebf7cf1d4fddc54185471087a053 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 14 Mar 2016 16:50:52 -0400 Subject: [PATCH] More accessible_objects -> objects + filter --- awx/main/access.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index 0786cdd08f..91d78fc849 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -1046,7 +1046,7 @@ class JobHostSummaryAccess(BaseAccess): model = JobHostSummary def get_queryset(self): - qs = self.model.accessible_objects(self.user, {'read':True}) + qs = self.model.objects qs = qs.select_related('job', 'job__job_template', 'host') if self.user.is_superuser: return qs @@ -1071,7 +1071,7 @@ class JobEventAccess(BaseAccess): model = JobEvent def get_queryset(self): - qs = self.model.accessible_objects(self.user, {'read':True}) + qs = self.model.objects qs = qs.select_related('job', 'job__job_template', 'host', 'parent') qs = qs.prefetch_related('hosts', 'children') @@ -1108,7 +1108,7 @@ class UnifiedJobTemplateAccess(BaseAccess): model = UnifiedJobTemplate def get_queryset(self): - qs = self.model.accessible_objects(self.user, {'read':True}) + qs = self.model.objects project_qs = self.user.get_queryset(Project).filter(scm_type__in=[s[0] for s in Project.SCM_TYPE_CHOICES]) inventory_source_qs = self.user.get_queryset(InventorySource).filter(source__in=CLOUD_INVENTORY_SOURCES) job_template_qs = self.user.get_queryset(JobTemplate) @@ -1140,7 +1140,7 @@ class UnifiedJobAccess(BaseAccess): model = UnifiedJob def get_queryset(self): - qs = self.model.accessible_objects(self.user, {'read':True}) + qs = self.model.objects project_update_qs = self.user.get_queryset(ProjectUpdate) inventory_update_qs = self.user.get_queryset(InventoryUpdate).filter(source__in=CLOUD_INVENTORY_SOURCES) job_qs = self.user.get_queryset(Job)