diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 01ab3c6fac..2f98fc6053 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -609,7 +609,7 @@ class UnifiedJobSerializer(BaseSerializer): summary_fields['source_workflow_job'] = {} try: summary_obj = obj.unified_job_node.workflow_job - except ObjectDoesNotExist: + except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist: return summary_fields for field in SUMMARIZABLE_FK_FIELDS['job']: diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py index 712bb73530..31afe69d32 100644 --- a/awx/main/models/unified_jobs.py +++ b/awx/main/models/unified_jobs.py @@ -20,7 +20,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.timezone import now from django.utils.encoding import smart_text from django.apps import apps -from django.core.exceptions import ObjectDoesNotExist # Django-Polymorphic from polymorphic import PolymorphicModel @@ -783,7 +782,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique if self.spawned_by_workflow: try: return self.unified_job_node.workflow_job.pk - except ObjectDoesNotExist: + except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist: pass return None @@ -792,7 +791,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique if self.spawned_by_workflow: try: return self.unified_job_node.pk - except ObjectDoesNotExist: + except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist: pass return None