From 4747be70141d6fabfc1fce578f7a28c023887a88 Mon Sep 17 00:00:00 2001 From: mabashian Date: Tue, 20 Aug 2019 09:36:36 -0400 Subject: [PATCH] Fixes bug in wf prompt modal by checking extra vars type before processing --- awx/ui/client/src/templates/prompt/prompt.service.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/ui/client/src/templates/prompt/prompt.service.js b/awx/ui/client/src/templates/prompt/prompt.service.js index 338a3ff128..61c241e5ee 100644 --- a/awx/ui/client/src/templates/prompt/prompt.service.js +++ b/awx/ui/client/src/templates/prompt/prompt.service.js @@ -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; }