External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 20:00:43 -03:30
Code Issues Packages Projects Releases Wiki Activity

add WorkflowJob properties to UnifiedJob

Browse Source
This commit is contained in:
Wayne Witzel III 2016-11-09 12:26:21 -05:00
parent 43450c2694
commit 42f1a491c1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -758,6 +758,16 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
def result_stdout_limited(self, start_line=0, end_line=None, redact_sensitive=False):
return self._result_stdout_raw_limited(start_line, end_line, redact_sensitive, escape_ascii=True)
@property
def spawned_by_workflow(self):
return self.launch_type == 'workflow'
@property
def workflow_job_id(self):
if self.spawned_by_workflow():
return self.unified_job_node.workflow_job.pk
return None
@property
def celery_task(self):
try:

4
awx/main/models/workflow.py
View File

@ -185,9 +185,9 @@ class WorkflowJobTemplateNode(WorkflowNodeBase):
return WorkflowJobNode.objects.create(**create_kwargs)
class WorkflowJobNode(WorkflowNodeBase):
job = models.ForeignKey(
job = models.OneToOneField(
'UnifiedJob',
related_name='unified_job_nodes',
related_name='unified_job_node',
blank=True,
null=True,
default=None,