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

Merge prompt extra_vars before POSTing

Browse Source 
* Merge the extra_vars field with survey question responses before sending
to API
* Clean up select and multi-select survey fields
This commit is contained in:
Keith Grant
2020-04-16 15:40:28 -07:00
parent 669d67b8fb
commit 08381577f5
7 changed files with 166 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui_next/src/components/LaunchPrompt/LaunchPrompt.jsx
View File

@@ -8,6 +8,7 @@ import CredentialsStep from './CredentialsStep';
import OtherPromptsStep from './OtherPromptsStep';
import SurveyStep from './SurveyStep';
import PreviewStep from './PreviewStep';
import mergeExtraVars from './mergeExtraVars';
function LaunchPrompt({ config, resource, onLaunch, onCancel, i18n }) {
const steps = [];
@@ -69,6 +70,7 @@ function LaunchPrompt({ config, resource, onLaunch, onCancel, i18n }) {
});
}
if (config.survey_enabled) {
initialValues.survey = {};
steps.push({
name: i18n._(t`Survey`),
component: <SurveyStep template={resource} />,
@@ -93,7 +95,7 @@ function LaunchPrompt({ config, resource, onLaunch, onCancel, i18n }) {
setValue('limit', values.limit);
setValue('job_tags', values.job_tags);
setValue('skip_tags', values.skip_tags);
setValue('extra_vars', values.extra_vars);
setValue('extra_vars', mergeExtraVars(values.extra_vars, values.survey));
onLaunch(postValues);
};