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

Merge pull request #3235 from AlanCoding/3234_ev_survey_fix

Browse Source 
Fix survey extra_vars processing error
This commit is contained in:
Alan Rominger
2016-08-12 10:17:40 -04:00
committed by GitHub
parent ee66fd4aa5 fab0ff18d8
commit 95011b1aa0
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -447,11 +447,21 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
if field == 'extra_vars' and self.survey_enabled and self.survey_spec:
# Accept vars defined in the survey and no others
survey_vars = [question['variable'] for question in self.survey_spec.get('spec', [])]
for key in kwargs[field]:
extra_vars = kwargs[field]
if isinstance(extra_vars, basestring):
try:
extra_vars = json.loads(extra_vars)
except (ValueError, TypeError):
try:
extra_vars = yaml.safe_load(extra_vars)
assert isinstance(extra_vars, dict)
except (yaml.YAMLError, TypeError, AttributeError, AssertionError):
extra_vars = {}
for key in extra_vars:
if key in survey_vars:
prompted_fields[field][key] = kwargs[field][key]
prompted_fields[field][key] = extra_vars[key]
else:
ignored_fields[field][key] = kwargs[field][key]
ignored_fields[field][key] = extra_vars[key]
else:
ignored_fields[field] = kwargs[field]