zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-13 03:58:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

some more events view cleanup

Browse Source
This commit is contained in:
Ryan Petrello
2021-02-25 15:47:59 -05:00
committed by Jim Ladd
parent c7ab3ea86e
commit 2a58605727
2 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/api/views/__init__.py
+9 -18
View File
@@ -888,12 +888,9 @@ class ProjectUpdateEventsList(SubListAPIView):
return super(ProjectUpdateEventsList, self).finalize_response(request, response, *args, **kwargs)
def get_queryset(self):
job = self.get_parent_object()
self.check_parent_access(job)
qs = super(ProjectUpdateEventsList, self).get_queryset()
return qs.filter(
job_created__in=(job.created, EPOCH)
).order_by('start_line').all()
return super(ProjectUpdateEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
)
class SystemJobEventsList(SubListAPIView):
@@ -909,12 +906,9 @@ class SystemJobEventsList(SubListAPIView):
return super(SystemJobEventsList, self).finalize_response(request, response, *args, **kwargs)
def get_queryset(self):
job = self.get_parent_object()
self.check_parent_access(job)
qs = job.system_job_events.select_related('host').filter(
job_created__in=(job.created, EPOCH)
).order_by('start_line')
return qs.all()
return super(SystemJobEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
)
class ProjectUpdateCancel(RetrieveAPIView):
@@ -4016,12 +4010,9 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView):
search_fields = ('stdout',)
def get_queryset(self):
job = self.get_parent_object()
self.check_parent_access(job)
qs = job.ad_hoc_command_events.select_related('host').filter(
job_created__in=(job.created, EPOCH)
).order_by('start_line')
return qs.all()
return super(BaseAdHocCommandEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
)
class HostAdHocCommandEventsList(BaseAdHocCommandEventsList):