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

Added job event parent/child fields, update event display to show hierarchy levels.

Browse Source
This commit is contained in:
Chris Church
2013-06-17 12:28:21 -04:00
parent c979817593
commit 232c4f2391
5 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ansibleworks/main/serializers.py
View File

@@ -302,7 +302,7 @@ class JobTemplateSerializer(BaseSerializer):
model = JobTemplate
fields = BASE_FIELDS + ('job_type', 'inventory', 'project', 'playbook',
'credential', 'forks', 'limit', 'verbosity',
'extra_vars', 'job_tags')
'extra_vars', 'job_tags', 'host_config_key')
def get_related(self, obj):
res = super(JobTemplateSerializer, self).get_related(obj)
@@ -393,18 +393,27 @@ class JobHostSummarySerializer(BaseSerializer):
class JobEventSerializer(BaseSerializer):
event_display = serializers.Field(source='get_event_display')
event_display = serializers.Field(source='get_event_display2')
class Meta:
model = JobEvent
fields = ('id', 'url', 'created', 'job', 'event', 'event_display',
'event_data', 'failed', 'host', 'related', 'summary_fields')
'event_data', 'failed', 'host', 'related', 'summary_fields',
'parent')
def get_related(self, obj):
res = super(JobEventSerializer, self).get_related(obj)
res.update(dict(
job = reverse('main:job_detail', args=(obj.job.pk,)),
#children = reverse('main:job_event_children_list', args=(obj.pk,)),
))
if obj.parent:
res['parent'] = reverse('main:job_event_detail', args=(obj.parent.pk,))
if obj.children.count():
res['children'] = reverse('main:job_event_children_list', args=(obj.pk,))
if obj.host:
res['host'] = reverse('main:host_detail', args=(obj.host.pk,))
if obj.hosts.count():
# FIXME: Why are hosts not set for top level playbook events.
res['hosts'] = reverse('main:job_event_hosts_list', args=(obj.pk,))
return res