From 66a8170bbcafb970ac6fa644dee039b18ee82826 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 17 Aug 2017 10:33:10 -0400 Subject: [PATCH] basic API optimization of labels list --- awx/main/access.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index bf722c0e2c..8842336ffb 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -2170,10 +2170,13 @@ class LabelAccess(BaseAccess): def get_queryset(self): if self.user.is_superuser or self.user.is_system_auditor: - return self.model.objects.all() - return self.model.objects.all().filter( - organization__in=Organization.accessible_objects(self.user, 'read_role') - ) + qs = self.model.objects.all() + else: + qs = self.model.objects.all().filter( + organization__in=Organization.accessible_pk_qs(self.user, 'read_role') + ) + qs = qs.prefetch_related('modified_by', 'created_by', 'organization') + return qs @check_superuser def can_read(self, obj):