From 80b08d17e3ddb4b6c04a95ebb3810e653d42b4be Mon Sep 17 00:00:00 2001 From: Jim Ladd Date: Wed, 24 Feb 2021 22:02:08 -0800 Subject: [PATCH] Continue updating job event views --- awx/api/views/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/api/views/__init__.py b/awx/api/views/__init__.py index 44baa1020a..9abc909d1a 100644 --- a/awx/api/views/__init__.py +++ b/awx/api/views/__init__.py @@ -886,8 +886,8 @@ class ProjectUpdateEventsList(SubListAPIView): def get_queryset(self): job = self.get_parent_object() self.check_parent_access(job) - qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line') - return qs.all() + qs = super(ProjectUpdateEventsList, self).get_queryset() + return qs.filter(job_created=job.created).order_by('start_line').all() class SystemJobEventsList(SubListAPIView): @@ -3825,7 +3825,7 @@ class JobJobEventsList(BaseJobEventsList): def get_queryset(self): job = self.get_parent_object() self.check_parent_access(job) - qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line') + qs = job.job_events.filter(job_created=job.created).select_related('host').order_by('start_line') return qs.all() @@ -4008,7 +4008,7 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView): def get_queryset(self): job = self.get_parent_object() self.check_parent_access(job) - qs = job.job_events.select_related('host').filter(job_created=job.created).order_by('start_line') + qs = job.ad_hoc_command_events.select_related('host').filter(job_created=job.created).order_by('start_line') return qs.all()