shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

optimizations for unified job subtypes

Browse Source
This commit is contained in:
AlanCoding 2017-08-19 07:05:37 -04:00
parent 3957797815
commit a1083d45c5
No known key found for this signature in database
GPG Key ID: FD2C3C012A72926B
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
awx/main/access.py
View File

@ -834,6 +834,10 @@ class InventoryUpdateAccess(BaseAccess):
def get_queryset(self): def get_queryset(self):
qs = InventoryUpdate.objects.distinct() qs = InventoryUpdate.objects.distinct()
qs = qs.select_related('created_by', 'modified_by', 'inventory_source__inventory') qs = qs.select_related('created_by', 'modified_by', 'inventory_source__inventory')
qs = qs.prefetch_related(
'unified_job_template',
'instance_group'
)
inventory_sources_qs = self.user.get_queryset(InventorySource) inventory_sources_qs = self.user.get_queryset(InventorySource)
return qs.filter(inventory_source__in=inventory_sources_qs) return qs.filter(inventory_source__in=inventory_sources_qs)
@ -1080,11 +1084,17 @@ class ProjectUpdateAccess(BaseAccess):
def get_queryset(self): def get_queryset(self):
if self.user.is_superuser or self.user.is_system_auditor: if self.user.is_superuser or self.user.is_system_auditor:
return self.model.objects.all() qs = self.model.objects.all()
qs = ProjectUpdate.objects.distinct() else:
qs = self.model.objects.filter(
project__in=Project.accessible_pk_qs(self.user, 'read_role')
)
qs = qs.select_related('created_by', 'modified_by', 'project') qs = qs.select_related('created_by', 'modified_by', 'project')
project_ids = set(self.user.get_queryset(Project).values_list('id', flat=True)) qs = qs.prefetch_related(
return qs.filter(project_id__in=project_ids) 'unified_job_template',
'instance_group'
)
return qs
@check_superuser @check_superuser
def can_cancel(self, obj): def can_cancel(self, obj):
@ -1304,7 +1314,11 @@ class JobAccess(BaseAccess):
qs = self.model.objects qs = self.model.objects
qs = qs.select_related('created_by', 'modified_by', 'job_template', 'inventory', qs = qs.select_related('created_by', 'modified_by', 'job_template', 'inventory',
'project', 'credential', 'job_template') 'project', 'credential', 'job_template')
qs = qs.prefetch_related('unified_job_template') qs = qs.prefetch_related(
'unified_job_template',
'instance_group',
Prefetch('labels', queryset=Label.objects.all().order_by('name'))
)
if self.user.is_superuser or self.user.is_system_auditor: if self.user.is_superuser or self.user.is_system_auditor:
return qs.all() return qs.all()