External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-06 08:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

use more precise exception

Browse Source
This commit is contained in:
Chris Meyers
2016-12-05 13:54:33 -05:00
parent f47f8abe42
commit a5b1c7b579
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -609,7 +609,7 @@ class UnifiedJobSerializer(BaseSerializer):
summary_fields['source_workflow_job'] = {} summary_fields['source_workflow_job'] = {}
try: try:
summary_obj = obj.unified_job_node.workflow_job summary_obj = obj.unified_job_node.workflow_job
except ObjectDoesNotExist: except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
return summary_fields return summary_fields
for field in SUMMARIZABLE_FK_FIELDS['job']: for field in SUMMARIZABLE_FK_FIELDS['job']:

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

@@ -20,7 +20,6 @@ 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
@@ -783,7 +782,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
if self.spawned_by_workflow: if self.spawned_by_workflow:
try: try:
return self.unified_job_node.workflow_job.pk return self.unified_job_node.workflow_job.pk
except ObjectDoesNotExist: except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
pass pass
return None return None
@@ -792,7 +791,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
if self.spawned_by_workflow: if self.spawned_by_workflow:
try: try:
return self.unified_job_node.pk return self.unified_job_node.pk
except ObjectDoesNotExist: except UnifiedJob.unified_job_node.RelatedObjectDoesNotExist:
pass pass
return None return None