External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 13:39:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix some invalid assumptions about hosts and jobs where we assume a job

Browse Source 
template will always be available
This commit is contained in:
Matthew Jones
2014-06-23 13:39:09 -04:00
parent 788cf2e24e
commit 8d78755ef4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/api/serializers.py
View File

@@ -756,7 +756,11 @@ class HostSerializer(BaseSerializerWithVariables):
d['last_job']['job_template_name'] = obj.last_job.job_template.name d['last_job']['job_template_name'] = obj.last_job.job_template.name
except (KeyError, AttributeError): except (KeyError, AttributeError):
pass pass
d.update({'recent_jobs': [{'id': j.job.id, 'name': j.job.job_template.name, 'status': j.job.status, if j.job.job_template is not None:
job_template_name = j.job.job_template.name
else:
job_template_name = ""
d.update({'recent_jobs': [{'id': j.job.id, 'name': job_template_name, 'status': j.job.status,
'finished': j.job.finished} for j in obj.job_host_summaries.all().order_by('-created')[:5]]}) 'finished': j.job.finished} for j in obj.job_host_summaries.all().order_by('-created')[:5]]})
return d return d

2
awx/main/models/jobs.py
View File

@@ -259,7 +259,7 @@ class Job(UnifiedJob, JobOptions):
def is_blocked_by(self, obj): def is_blocked_by(self, obj):
from awx.main.models import InventoryUpdate, ProjectUpdate from awx.main.models import InventoryUpdate, ProjectUpdate
if type(obj) == Job: if type(obj) == Job:
if obj.job_template == self.job_template: if obj.job_template is not None and obj.job_template == self.job_template:
if obj.launch_type == 'callback' and self.launch_type == 'callback': if obj.launch_type == 'callback' and self.launch_type == 'callback':
if obj.limit != self.limit: if obj.limit != self.limit:
return False return False