Merge pull request #4974 from AlanCoding/job_event_need_for_speed

job_event speedups, async filter removed, RBAC changes
This commit is contained in:
Alan Rominger
2017-01-27 11:23:25 -05:00
committed by GitHub
3 changed files with 11 additions and 16 deletions

View File

@@ -3487,13 +3487,10 @@ class JobJobEventsList(BaseJobEventsList):
def get_queryset(self):
job = self.get_parent_object()
self.check_parent_access(job)
qs = job.job_events.all()
qs = job.job_events
qs = qs.select_related('host')
qs = qs.prefetch_related('hosts', 'children')
if self.request.user.is_superuser or self.request.user.is_system_auditor:
return qs.all()
host_qs = self.request.user.get_queryset(Host)
return qs.filter(Q(host__isnull=True) | Q(host__in=host_qs))
return qs.all()
class AdHocCommandList(ListCreateAPIView):