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

Merge pull request #4291 from chrismeyersfsu/fix-unified_job_node

Browse Source 
finished fixing job through workflow node
This commit is contained in:
Chris Meyers
2016-12-05 14:27:42 -05:00
committed by GitHub
parent 0346d5a559 a5b1c7b579
commit 0d8f14647f
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@@ -608,7 +608,11 @@ class UnifiedJobSerializer(BaseSerializer):
summary_fields = super(UnifiedJobSerializer, self).get_summary_fields(obj) summary_fields = super(UnifiedJobSerializer, self).get_summary_fields(obj)
if obj.spawned_by_workflow: if obj.spawned_by_workflow:
summary_fields['source_workflow_job'] = {} summary_fields['source_workflow_job'] = {}
summary_obj = obj.unified_job_node.workflow_job try:
summary_obj = obj.unified_job_node.workflow_job
except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
return summary_fields
for field in SUMMARIZABLE_FK_FIELDS['job']: for field in SUMMARIZABLE_FK_FIELDS['job']:
val = getattr(summary_obj, field, None) val = getattr(summary_obj, field, None)
if val is not None: if val is not None:

10
awx/main/models/unified_jobs.py
View File

@@ -780,13 +780,19 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
@property @property
def workflow_job_id(self): def workflow_job_id(self):
if self.spawned_by_workflow: if self.spawned_by_workflow:
return self.unified_job_node.workflow_job.pk try:
return self.unified_job_node.workflow_job.pk
except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
pass
return None return None
@property @property
def workflow_node_id(self): def workflow_node_id(self):
if self.spawned_by_workflow: if self.spawned_by_workflow:
return self.unified_job_node.pk try:
return self.unified_job_node.pk
except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
pass
return None return None
@property @property