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

Merge pull request #1620 from mabashian/1589-relaunch-passwords

Browse Source 
Fixed error showing vault password prompts on relaunch
This commit is contained in:
Michael Abashian
2018-05-02 14:01:06 -04:00
committed by GitHub
parent b62dfa3e49 24e363888a
commit 5cda2c94ac
7 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/lib/components/relaunchButton/relaunchButton.component.js
View File

@@ -41,11 +41,12 @@ function atRelaunchCtrl (
) {
const jobPromises = [
jobObj.request('get', vm.job.id),
jobTemplate.optionsLaunch(vm.job.unified_job_template)
jobTemplate.optionsLaunch(vm.job.unified_job_template),
jobObj.getCredentials(vm.job.id)
];
$q.all(jobPromises)
.then(([jobRes, launchOptions]) => {
.then(([jobRes, launchOptions, jobCreds]) => {
const populatedJob = jobRes.data;
const jobTypeChoices = _.get(
launchOptions,
@@ -76,7 +77,11 @@ function atRelaunchCtrl (
relaunchHostType: option ? (option.name).toLowerCase() : null,
prompts: {
credentials: {
value: populatedJob.summary_fields.credentials || []
value: populatedJob.summary_fields.credentials ?
_.merge(
jobCreds.data.results,
populatedJob.summary_fields.credentials
) : []
},
variables: {
value: populatedJob.extra_vars