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

fix unexpected deselect when selecting no-vault-id vault credentials

Browse Source
This commit is contained in:
Jake McDermott
2018-01-23 10:19:19 -05:00
parent 7c596039c5
commit 7300c2ccc1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js
View File

@@ -145,7 +145,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
if(isReadOnly(credential) && credentialTypeId !== types.Vault) { if(isReadOnly(credential) && credentialTypeId !== types.Vault) {
const index = displayedCredentialTypes const index = displayedCredentialTypes
.map(t => t.id).indexOf(credential.credential_type); .map(t => t.id).indexOf(credentialTypeId);
if (index > -1) { if (index > -1) {
displayedCredentialTypes.splice(index, 1); displayedCredentialTypes.splice(index, 1);
@@ -227,13 +227,17 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
return; return;
} }
if (credential.credential_type === types.Vault) { const credentialTypeId = credential.credential_type || credential.credential_type_id;
if (credentialTypeId === types.Vault) {
const vaultId = _.get(credential, 'inputs.vault_id');
scope.modalSelectedCredentials = scope.modalSelectedCredentials scope.modalSelectedCredentials = scope.modalSelectedCredentials
.filter(({ inputs }) => inputs.vault_id !== credential.inputs.vault_id) .filter(c => (c.credential_type !== types.Vault) || (c.inputs.vault_id !== vaultId))
.concat([credential]); .concat([credential]);
} else { } else {
scope.modalSelectedCredentials = scope.modalSelectedCredentials scope.modalSelectedCredentials = scope.modalSelectedCredentials
.filter(({ credential_type }) => credential_type !== credential.credential_type) .filter(({ credential_type }) => credential_type !== credentialTypeId)
.concat([credential]); .concat([credential]);
} }
}; };