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

Merge pull request #1516 from mabashian/fix-prompt-creds

Browse Source 
Fixed merge conflict error that prevents launching JTs with cred prompting
This commit is contained in:
Michael Abashian
2018-04-23 13:46:50 -04:00
committed by GitHub
parent fd598f5adc e38d779d04
commit 7a281cefed
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
awx/ui/client/src/templates/prompt/prompt.controller.js
View File

@@ -70,16 +70,16 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
vm.promptDataClone.prompts.credentials.passwords = {}; vm.promptDataClone.prompts.credentials.passwords = {};
if(vm.promptData.launchConf.passwords_needed_to_start) { if(vm.promptDataClone.launchConf.passwords_needed_to_start) {
vm.promptData.launchConf.passwords_needed_to_start.forEach((passwordNeeded) => { vm.promptDataClone.launchConf.passwords_needed_to_start.forEach((passwordNeeded) => {
if(passwordNeeded === "ssh_password") { if(passwordNeeded === "ssh_password") {
vm.promptData.prompts.credentials.passwords.ssh = {}; vm.promptDataClone.prompts.credentials.passwords.ssh = {};
} }
if(passwordNeeded === "become_password") { if(passwordNeeded === "become_password") {
vm.promptData.prompts.credentials.passwords.become = {}; vm.promptDataClone.prompts.credentials.passwords.become = {};
} }
if(passwordNeeded === "ssh_key_unlock") { if(passwordNeeded === "ssh_key_unlock") {
vm.promptData.prompts.credentials.passwords.ssh_key_unlock = {}; vm.promptDataClone.prompts.credentials.passwords.ssh_key_unlock = {};
} }
if(passwordNeeded.startsWith("vault_password")) { if(passwordNeeded.startsWith("vault_password")) {
let vault_id; let vault_id;
@@ -87,11 +87,11 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
vault_id = passwordNeeded.split(/\.(.+)/)[1]; vault_id = passwordNeeded.split(/\.(.+)/)[1];
} }
if(!vm.promptData.prompts.credentials.passwords.vault) { if(!vm.promptDataClone.prompts.credentials.passwords.vault) {
vm.promptData.prompts.credentials.passwords.vault = []; vm.promptDataClone.prompts.credentials.passwords.vault = [];
} }
vm.promptData.prompts.credentials.passwords.vault.push({ vm.promptDataClone.prompts.credentials.passwords.vault.push({
vault_id: vault_id vault_id: vault_id
}); });
} }