External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 12:27:37 -02:30
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

27
awx/api/views/__init__.py
View File

@@ -888,12 +888,9 @@ class ProjectUpdateEventsList(SubListAPIView):
return super(ProjectUpdateEventsList, self).finalize_response(request, response, *args, **kwargs) return super(ProjectUpdateEventsList, self).finalize_response(request, response, *args, **kwargs)
def get_queryset(self): def get_queryset(self):
job = self.get_parent_object() return super(ProjectUpdateEventsList, self).get_queryset().filter(
self.check_parent_access(job) job_created__in=(self.get_parent_object().created, EPOCH)
qs = super(ProjectUpdateEventsList, self).get_queryset() )
return qs.filter(
job_created__in=(job.created, EPOCH)
).order_by('start_line').all()
class SystemJobEventsList(SubListAPIView): class SystemJobEventsList(SubListAPIView):
@@ -909,12 +906,9 @@ class SystemJobEventsList(SubListAPIView):
return super(SystemJobEventsList, self).finalize_response(request, response, *args, **kwargs) return super(SystemJobEventsList, self).finalize_response(request, response, *args, **kwargs)
def get_queryset(self): def get_queryset(self):
job = self.get_parent_object() return super(SystemJobEventsList, self).get_queryset().filter(
self.check_parent_access(job) job_created__in=(self.get_parent_object().created, EPOCH)
qs = job.system_job_events.select_related('host').filter( )
job_created__in=(job.created, EPOCH)
).order_by('start_line')
return qs.all()
class ProjectUpdateCancel(RetrieveAPIView): class ProjectUpdateCancel(RetrieveAPIView):
@@ -4016,12 +4010,9 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView):
search_fields = ('stdout',) search_fields = ('stdout',)
def get_queryset(self): def get_queryset(self):
job = self.get_parent_object() return super(BaseAdHocCommandEventsList, self).get_queryset().filter(
self.check_parent_access(job) job_created__in=(self.get_parent_object().created, EPOCH)
qs = job.ad_hoc_command_events.select_related('host').filter( )
job_created__in=(job.created, EPOCH)
).order_by('start_line')
return qs.all()
class HostAdHocCommandEventsList(BaseAdHocCommandEventsList): class HostAdHocCommandEventsList(BaseAdHocCommandEventsList):

8
awx/api/views/inventory.py
View File

@@ -2,6 +2,7 @@
# All Rights Reserved. # All Rights Reserved.
# Python # Python
import datetime
import logging import logging
# Django # Django
@@ -40,6 +41,8 @@ from awx.api.views.mixin import RelatedJobsPreventDeleteMixin, ControlledByScmMi
logger = logging.getLogger('awx.api.views.organization') logger = logging.getLogger('awx.api.views.organization')
EPOCH = datetime.datetime.utcfromtimestamp(0)
class InventoryUpdateEventsList(SubListAPIView): class InventoryUpdateEventsList(SubListAPIView):
@@ -50,6 +53,11 @@ class InventoryUpdateEventsList(SubListAPIView):
name = _('Inventory Update Events List') name = _('Inventory Update Events List')
search_fields = ('stdout',) search_fields = ('stdout',)
def get_queryset(self):
return super(InventoryUpdateEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
)
def finalize_response(self, request, response, *args, **kwargs): def finalize_response(self, request, response, *args, **kwargs):
response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS response['X-UI-Max-Events'] = settings.MAX_UI_JOB_EVENTS
return super(InventoryUpdateEventsList, self).finalize_response(request, response, *args, **kwargs) return super(InventoryUpdateEventsList, self).finalize_response(request, response, *args, **kwargs)