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

Merge pull request #1914 from mabashian/1901-wfjt-prompt-vars

Browse Source 
Fix aggregation of extra vars on wfjt launch preview
This commit is contained in:
Michael Abashian
2018-05-23 10:11:57 -04:00
committed by GitHub
parent 81126fd48f 87f4104304
commit c7a0634480
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/lib/components/launchTemplateButton/launchTemplateButton.component.js
View File

@@ -73,12 +73,13 @@ function atLaunchTemplateCtrl (
} else if (vm.template.type === 'workflow_job_template') { } else if (vm.template.type === 'workflow_job_template') {
const selectedWorkflowJobTemplate = workflowTemplate.create(); const selectedWorkflowJobTemplate = workflowTemplate.create();
const preLaunchPromises = [ const preLaunchPromises = [
selectedWorkflowJobTemplate.request('get', vm.template.id),
selectedWorkflowJobTemplate.getLaunch(vm.template.id), selectedWorkflowJobTemplate.getLaunch(vm.template.id),
selectedWorkflowJobTemplate.optionsLaunch(vm.template.id), selectedWorkflowJobTemplate.optionsLaunch(vm.template.id),
]; ];
Promise.all(preLaunchPromises) Promise.all(preLaunchPromises)
.then(([launchData, launchOptions]) => { .then(([wfjtData, launchData, launchOptions]) => {
if (selectedWorkflowJobTemplate.canLaunchWithoutPrompt()) { if (selectedWorkflowJobTemplate.canLaunchWithoutPrompt()) {
selectedWorkflowJobTemplate selectedWorkflowJobTemplate
.postLaunch({ id: vm.template.id }) .postLaunch({ id: vm.template.id })
@@ -86,6 +87,9 @@ function atLaunchTemplateCtrl (
$state.go('workflowResults', { id: data.workflow_job }, { reload: true }); $state.go('workflowResults', { id: data.workflow_job }, { reload: true });
}); });
} else { } else {
launchData.data.defaults = {
extra_vars: wfjtData.data.extra_vars
};
const promptData = { const promptData = {
launchConf: launchData.data, launchConf: launchData.data,
launchOptions: launchOptions.data, launchOptions: launchOptions.data,