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

Merge pull request #1499 from mabashian/1458-vault-pass-prompt

Browse Source 
Fixed bug where vault password prompt was not being hidden after removing default cred
This commit is contained in:
Michael Abashian
2018-04-25 11:20:49 -04:00
committed by GitHub
parent d5c2af0492 e62a8797ae
commit b14a7eda35
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js
View File

@@ -53,7 +53,7 @@ function atLaunchTemplateCtrl (
launchConf: launchData.data, launchConf: launchData.data,
launchOptions: launchOptions.data launchOptions: launchOptions.data
}), }),
triggerModalOpen: true, triggerModalOpen: true
}; };
if (launchData.data.survey_enabled) { if (launchData.data.survey_enabled) {

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

@@ -82,17 +82,25 @@ export default [ 'Rest', 'GetBasePath', 'ProcessErrors', 'CredentialTypeModel',
vm.promptDataClone.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 = null;
if(passwordNeeded.includes('.')) { if (passwordNeeded.includes('.')) {
vault_id = passwordNeeded.split(/\.(.+)/)[1]; vault_id = passwordNeeded.split(/\.(.+)/)[1];
} }
if(!vm.promptDataClone.prompts.credentials.passwords.vault) { if (!vm.promptDataClone.prompts.credentials.passwords.vault) {
vm.promptDataClone.prompts.credentials.passwords.vault = []; vm.promptDataClone.prompts.credentials.passwords.vault = [];
} }
vm.promptDataClone.prompts.credentials.passwords.vault.push({ // Loop across the default credentials to find the name of the
vault_id: vault_id // credential that requires a password
vm.promptDataClone.prompts.credentials.value.forEach((defaultCredential) => {
if (defaultCredential.vault_id === vault_id) {
vm.promptDataClone.prompts.credentials.passwords.vault.push({
id: defaultCredential.id,
name: defaultCredential.name,
vault_id: defaultCredential.vault_id
});
}
}); });
} }
}); });