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

Merge pull request #2646 from jlmitch5/fixCredentialKindTranslation

Browse Source 
Fix credential kind translation

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-10 03:06:38 +00:00 committed by GitHub
commit a00ed8e297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/inventories-hosts/inventories/main.js
View File

@ -135,7 +135,7 @@ angular.module('inventory', [
if(_.has(resourceData, 'data.summary_fields.insights_credential')){
return credentialTypesLookup()
.then(kinds => {
let insightsKind = kinds.Insights;
let insightsKind = kinds.insights;
let path = `${GetBasePath('projects')}?credential__credential_type=${insightsKind}&role_level=use_role`;
Rest.setUrl(path);
return Rest.get().then(({data}) => {

2
awx/ui/client/src/job-submission/job-submission-factories/check-passwords.factory.js
View File

@ -12,7 +12,7 @@ export default
.then(({data}) => {
credentialTypesLookup()
.then(kinds => {
if(data.credential_type === kinds.Machine && data.inputs){
if(data.credential_type === kinds.ssh && data.inputs){
if(data.inputs.password === "ASK" ){
passwords.push("ssh_password");
}

2
awx/ui/client/src/job-submission/job-submission.directive.js
View File

@ -28,7 +28,7 @@ export default [ 'templateUrl', 'CreateDialog', 'Wait', 'CreateSelect2', 'ParseT
credentialTypesLookup()
.then(kinds => {
if(scope.ask_credential_on_launch) {
scope.credentialKind = "" + kinds.Machine;
scope.credentialKind = "" + kinds.ssh;
scope.includeCredentialList = true;
}
});

12
awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js
View File

@ -71,9 +71,9 @@ export default
$scope.$watchCollection('selectedCredentials.extra', () => {
if($scope.credentials && $scope.credentials.length > 0) {
if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) {
if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.ssh) {
updateExtraCredentialsList();
} else if (parseInt($scope.credentialKind) !== credentialKinds.Machine) {
} else if (parseInt($scope.credentialKind) !== credentialKinds.ssh) {
uncheckAllCredentials();
}
}
@ -81,7 +81,7 @@ export default
$scope.$watch('selectedCredentials.machine', () => {
if($scope.credentials && $scope.credentials.length > 0) {
if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) {
if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.ssh) {
updateMachineCredentialList();
}
else {
@ -92,10 +92,10 @@ export default
$scope.$watchGroup(['credentials', 'selectedCredentials.machine'], () => {
if($scope.credentials && $scope.credentials.length > 0) {
if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) {
if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.ssh) {
updateMachineCredentialList();
}
else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) {
else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.ssh) {
updateExtraCredentialsList();
}
else {
@ -106,7 +106,7 @@ export default
};
$scope.toggle_row = function(selectedRow) {
if(parseInt($scope.credentialKind) === credentialKinds.Machine) {
if(parseInt($scope.credentialKind) === credentialKinds.ssh) {
$scope.selectedCredentials.machine = _.cloneDeep(selectedRow);
}
else {

2
awx/ui/client/src/shared/credentialTypesLookup.factory.js
View File

@ -6,7 +6,7 @@ function(Rest, GetBasePath, ProcessErrors) {
.then(({data}) => {
var val = {};
data.results.forEach(type => {
val[type.name] = type.id;
val[type.kind] = type.id;
});
return val;
})

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

@ -96,7 +96,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
scope = _scope_;
scope.modalSelectedCredentials = _.cloneDeep(scope.selectedCredentials);
scope.credentialTypes.forEach(({ name, id }) => types[name] = id);
scope.credentialTypes.forEach(({ kind, id }) => types[kind] = id);
scope.toggle_row = vm.toggle_row;
scope.toggle_credential = vm.toggle_credential;
@ -152,13 +152,13 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
function getInitialCredentialType () {
const selectedMachineCredential = scope.modalSelectedCredentials
.find(c => c.id === types.Machine);
.find(c => c.id === types.ssh);
if (selectedMachineCredential) {
return `${types.Vault}`;
return `${types.vault}`;
}
return `${types.Machine}`;
return `${types.ssh}`;
}
function fetchCredentials (credentialType) {
@ -175,7 +175,7 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
scope.destroyList();
if (credentialType === types.Vault) {
if (credentialType === types.vault) {
scope.createVaultList();
} else {
scope.createList();
@ -215,11 +215,11 @@ function multiCredentialModalController(GetBasePath, qs, MultiCredentialService)
const credentialTypeId = credential.credential_type || credential.credential_type_id;
if (credentialTypeId === types.Vault) {
if (credentialTypeId === types.vault) {
const vaultId = _.get(credential, 'inputs.vault_id');
scope.modalSelectedCredentials = scope.modalSelectedCredentials
.filter(c => (c.credential_type !== types.Vault) || (c.inputs.vault_id !== vaultId))
.filter(c => (c.credential_type !== types.vault) || (c.inputs.vault_id !== vaultId))
.concat([credential]);
} else {
scope.modalSelectedCredentials = scope.modalSelectedCredentials