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

Merge pull request #135 from chrismeyersfsu/fix-cancel_job_template_with_survey

Browse Source 
job cancelation of job templates with surveys wont send extra_vars so don't expect them to
This commit is contained in:
Chris Meyers
2015-04-13 19:44:28 -04:00
parent e1fe342535 6698fb542f
commit d21d3ee191
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/serializers.py
View File

@@ -1472,7 +1472,7 @@ class JobSerializer(UnifiedJobSerializer, JobOptionsSerializer):
ret['job_template'] = None ret['job_template'] = None
if obj.job_template and obj.job_template.survey_enabled: if obj.job_template and obj.job_template.survey_enabled:
if ret['extra_vars']: if 'extra_vars' in ret:
try: try:
extra_vars = json.loads(ret['extra_vars']) extra_vars = json.loads(ret['extra_vars'])
for key in obj.job_template.survey_password_variables(): for key in obj.job_template.survey_password_variables():