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

reduce, reuse, recycle

Browse Source
This commit is contained in:
Wayne Witzel III
2017-01-24 16:44:42 -05:00
parent 735f5d14b3
commit fba1fa83d0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/mixins.py
View File

@@ -115,14 +115,14 @@ class SurveyJobTemplateMixin(models.Model):
# Overwrite with job template extra vars with survey default vars # Overwrite with job template extra vars with survey default vars
if self.survey_enabled and 'spec' in self.survey_spec: if self.survey_enabled and 'spec' in self.survey_spec:
for survey_element in self.survey_spec.get("spec", []): for survey_element in self.survey_spec.get("spec", []):
default = survey_element['default']
variable_key = survey_element['variable']
if survey_element.get('type') == 'password': if survey_element.get('type') == 'password':
default = survey_element.get('default', None) if variable_key in kwargs_extra_vars:
variable_key = survey_element['variable'] kw_value = kwargs_extra_vars[variable_key]
if default is not None and variable_key in kwargs_extra_vars: if kw_value.startswith('$encrypted$') and kw_value != default:
value = kwargs_extra_vars[variable_key]
if value.startswith('$encrypted$') and value != default:
kwargs_extra_vars[variable_key] = default kwargs_extra_vars[variable_key] = default
extra_vars[survey_element['variable']] = survey_element['default'] extra_vars[variable_key] = default
# Overwrite job template extra vars with explicit job extra vars # Overwrite job template extra vars with explicit job extra vars
# and add on job extra vars # and add on job extra vars