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

Merge pull request #3669 from mabashian/workflow-node-save

Browse Source 
Ensures extra vars are converted to yaml before being passed along to prompt steps

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-04-10 19:50:39 +00:00
committed by GitHub
parent cd966f2669 4f2443e7bb
commit 21bec83a4e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/templates/prompt/prompt.service.js
View File

@@ -27,7 +27,7 @@ function PromptService (Empty, $filter) {
if(hasCurrentExtraVars && hasDefaultExtraVars) { if(hasCurrentExtraVars && hasDefaultExtraVars) {
extraVars = jsyaml.safeDump(_.merge(jsyaml.safeLoad(params.launchConf.defaults.extra_vars), params.currentValues.extra_data)); extraVars = jsyaml.safeDump(_.merge(jsyaml.safeLoad(params.launchConf.defaults.extra_vars), params.currentValues.extra_data));
} else if(hasCurrentExtraVars) { } else if(hasCurrentExtraVars) {
extraVars = params.currentValues.extra_data; extraVars = jsyaml.safeDump(params.currentValues.extra_data);
} else if(hasDefaultExtraVars) { } else if(hasDefaultExtraVars) {
extraVars = params.launchConf.defaults.extra_vars; extraVars = params.launchConf.defaults.extra_vars;
} }