mirror of
https://github.com/ansible/awx.git
synced 2024-10-31 06:51:10 +03:00
Fixes bug in wf prompt modal by checking extra vars type before processing
This commit is contained in:
parent
2de87dcef0
commit
4747be7014
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user