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

add type to recent_jobs

Browse Source
This commit is contained in:
AlanCoding
2018-11-30 15:13:28 -05:00
parent 28733800c4
commit b763c51f8a
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/api/serializers.py
View File

@@ -2983,12 +2983,13 @@ class JobTemplateMixin(object):
'''
def _recent_jobs(self, obj):
if hasattr(obj, 'workflow_jobs'):
job_mgr = obj.workflow_jobs
else:
job_mgr = obj.jobs
return [{'id': x.id, 'status': x.status, 'finished': x.finished}
for x in job_mgr.all().order_by('-created')[:10]]
job_mgr = obj.unifiedjob_unified_jobs.non_polymorphic().exclude(job__job_slice_count__gt=1).only(
'id', 'status', 'finished', 'polymorphic_ctype_id')
type_mapping = {}
for model, ct in ContentType.objects.get_for_models(*UnifiedJob.__subclasses__()).iteritems():
type_mapping[ct.pk] = model._meta.verbose_name
return [{'id': x.id, 'status': x.status, 'finished': x.finished, 'type': type_mapping[x.polymorphic_ctype_id]}
for x in job_mgr.order_by('-created')[:10]]
def get_summary_fields(self, obj):
d = super(JobTemplateMixin, self).get_summary_fields(obj)