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

Fixes bug in wf prompt modal by checking extra vars type before processing

Browse Source
This commit is contained in:
mabashian
2019-08-20 09:36:36 -04:00
parent 2de87dcef0
commit 4747be7014
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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