External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-04 18:21:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

More fix up for job event aggregation filtering

Browse Source
This commit is contained in:
Matthew Jones
2014-06-26 10:51:44 -04:00
parent e5a89ff976
commit 7ecbe727ca
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
awx/api/views.py
View File

@@ -1587,19 +1587,6 @@ class JobJobTasksList(BaseJobEventsList):
.annotate(num=Count('event')) .annotate(num=Count('event'))
.order_by('parent__id')) .order_by('parent__id'))
# This is a bit of a special case for id filtering requested by the UI
# doing this here for the moment until/unless we need to implement more
# complex filtering (since we aren't under a serializer)
if "id__in" in request.QUERY_PARAMS:
queryset = queryset.filter(id__in=[int(filter_id) for filter_id in request.QUERY_PARAMS["id__in"].split(",")])
elif "id__gt" in request.QUERY_PARAMS:
queryset = queryset.filter(id__gt=request.QUERY_PARAMS['id__gt'])
elif "id__lt" in request.QUERY_PARAMS:
queryset = queryset.filter(id__lt=request.QUERY_PARAMS['id__lt'])
if "failed" in request.QUERY_PARAMS:
queryset = queryset.filter(failed=(request.QUERY_PARAMS['failed'].lower() == 'true'))
count = queryset.count() count = queryset.count()
# The data above will come back in a list, but we are going to # The data above will come back in a list, but we are going to
@@ -1615,6 +1602,23 @@ class JobJobTasksList(BaseJobEventsList):
# using their children. # using their children.
qs = parent_task.children.filter(event__in=STARTING_EVENTS, qs = parent_task.children.filter(event__in=STARTING_EVENTS,
id__in=data.keys()) id__in=data.keys())
# This is a bit of a special case for id filtering requested by the UI
# doing this here for the moment until/unless we need to implement more
# complex filtering (since we aren't under a serializer)
if "id__in" in request.QUERY_PARAMS:
qs = qs.filter(id__in=[int(filter_id) for filter_id in request.QUERY_PARAMS["id__in"].split(",")])
elif "id__gt" in request.QUERY_PARAMS:
qs = qs.filter(id__gt=request.QUERY_PARAMS['id__gt'])
elif "id__lt" in request.QUERY_PARAMS:
qs = qs.filter(id__lt=request.QUERY_PARAMS['id__lt'])
if "failed" in request.QUERY_PARAMS:
qs = qs.filter(failed=(request.QUERY_PARAMS['failed'].lower() == 'true'))
if ordering is not None:
qs = qs.order_by(ordering)
for task_start_event in qs: for task_start_event in qs:
# Create initial task data. # Create initial task data.
task_data = { task_data = {