External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 12:41:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

Resolve extra vars display mix-up with passworded survey questions.

Browse Source
This commit is contained in:
jangsutsr 2016-08-22 16:33:03 -04:00
parent 0991e213cc
commit 60b7309c08
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -746,9 +746,14 @@ class Job(UnifiedJob, JobOptions):
Hides fields marked as passwords in survey.
'''
if self.survey_passwords:
extra_vars = json.loads(self.extra_vars)
extra_vars.update(self.survey_passwords)
return json.dumps(extra_vars)
try:
extra_vars = json.loads(self.extra_vars)
for key, value in self.survey_passwords.items():
if key in extra_vars:
extra_vars[key] = value
return json.dumps(extra_vars)
except ValueError:
pass
else:
return self.extra_vars