mirror of
https://github.com/ansible/awx.git
synced 2026-05-19 14:57:39 -02:30
@@ -607,7 +607,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 ObjectDoesNotExist:
|
||||||
|
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:
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ from django.utils.translation import ugettext_lazy as _
|
|||||||
from django.utils.timezone import now
|
from django.utils.timezone import now
|
||||||
from django.utils.encoding import smart_text
|
from django.utils.encoding import smart_text
|
||||||
from django.apps import apps
|
from django.apps import apps
|
||||||
|
from django.core.exceptions import ObjectDoesNotExist
|
||||||
|
|
||||||
# Django-Polymorphic
|
# Django-Polymorphic
|
||||||
from polymorphic import PolymorphicModel
|
from polymorphic import PolymorphicModel
|
||||||
@@ -780,13 +781,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 ObjectDoesNotExist:
|
||||||
|
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 ObjectDoesNotExist:
|
||||||
|
pass
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
|||||||
Reference in New Issue
Block a user