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

only assign the default if it is not None

Browse Source
This commit is contained in:
Wayne Witzel III
2017-02-02 14:48:31 -05:00
parent fff8564bee
commit ec86961e13
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,8 @@ class SurveyJobTemplateMixin(models.Model):
kw_value = kwargs_extra_vars[variable_key]
if kw_value.startswith('$encrypted$') and kw_value != default:
kwargs_extra_vars[variable_key] = default
extra_vars[variable_key] = default
if default is not None:
extra_vars[variable_key] = default
# Overwrite job template extra vars with explicit job extra vars
# and add on job extra vars