From 4fe2f90689348f51b79ae60eb4b086e019d4c2fd Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 24 Jul 2017 13:58:00 -0400 Subject: [PATCH] update ssh to machine --- .../job-submission.directive.js | 2 +- .../job-sub-cred-list.controller.js | 12 +++++------ .../multi-credential-modal.directive.js | 20 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/awx/ui/client/src/job-submission/job-submission.directive.js b/awx/ui/client/src/job-submission/job-submission.directive.js index cdfb4c69d0..e8fe363c7a 100644 --- a/awx/ui/client/src/job-submission/job-submission.directive.js +++ b/awx/ui/client/src/job-submission/job-submission.directive.js @@ -27,7 +27,7 @@ export default [ 'templateUrl', 'CreateDialog', 'Wait', 'CreateSelect2', 'ParseT credentialTypesLookup() .then(kinds => { if(scope.ask_credential_on_launch) { - scope.credentialKind = "" + kinds.SSH; + scope.credentialKind = "" + kinds.Machine; scope.includeCredentialList = true; } }); diff --git a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js index 6a458c04c7..1cd819e009 100644 --- a/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js +++ b/awx/ui/client/src/job-submission/lists/credential/job-sub-cred-list.controller.js @@ -70,9 +70,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.SSH) { + if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) { updateExtraCredentialsList(); - } else if (parseInt($scope.credentialKind) !== credentialKinds.SSH) { + } else if (parseInt($scope.credentialKind) !== credentialKinds.Machine) { uncheckAllCredentials(); } } @@ -80,7 +80,7 @@ export default $scope.$watch('selectedCredentials.machine', () => { if($scope.credentials && $scope.credentials.length > 0) { - if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.SSH) { + if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) { updateMachineCredentialList(); } else { @@ -91,10 +91,10 @@ export default $scope.$watchGroup(['credentials', 'selectedCredentials.machine'], () => { if($scope.credentials && $scope.credentials.length > 0) { - if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.SSH) { + if($scope.selectedCredentials.machine && parseInt($scope.credentialKind) === credentialKinds.Machine) { updateMachineCredentialList(); } - else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.SSH) { + else if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && parseInt($scope.credentialKind) !== credentialKinds.Machine) { updateExtraCredentialsList(); } else { @@ -105,7 +105,7 @@ export default }; $scope.toggle_row = function(selectedRow) { - if(parseInt($scope.credentialKind) === credentialKinds.SSH) { + if(parseInt($scope.credentialKind) === credentialKinds.Machine) { $scope.selectedCredentials.machine = _.cloneDeep(selectedRow); } else { diff --git a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js index 2d82e3133d..db65ad3834 100644 --- a/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js +++ b/awx/ui/client/src/templates/job_templates/multi-credential/multi-credential-modal.directive.js @@ -14,14 +14,14 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' .then(kinds => { scope.credentialKinds = kinds; - scope.credentialKind = "" + kinds.SSH; + scope.credentialKind = "" + kinds.Machine; scope.showModal = function() { $('#multi-credential-modal').modal('show'); }; scope.destroyModal = function() { - scope.credentialKind = kinds.SSH; + scope.credentialKind = kinds.Machine; $('#multi-credential-modal').modal('hide'); }; @@ -62,7 +62,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' let extraCredIds = $scope.selectedCredentials.extra .map(cred => cred.id); $scope.credentials.forEach(cred => { - if (cred.credential_type !== $scope.credentialKinds.SSH) { + if (cred.credential_type !== $scope.credentialKinds.Machine) { cred.checked = (extraCredIds .indexOf(cred.id) > - 1) ? 1 : 0; } @@ -75,7 +75,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' let updateMachineCredentialList = function() { $scope.credentials.forEach(cred => { - if (cred.credential_type === $scope.credentialKinds.SSH) { + if (cred.credential_type === $scope.credentialKinds.Machine) { cred.checked = ($scope.selectedCredentials .machine !== null && cred.id === $scope.selectedCredentials @@ -158,9 +158,9 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' if($scope.credentials && $scope.credentials.length > 0) { if($scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && - parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { + parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) { updateExtraCredentialsList(); - } else if (parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { + } else if (parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) { uncheckAllCredentials(); } } @@ -169,7 +169,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' $scope.$watch('selectedCredentials.machine', () => { if($scope.selectedCredentials && $scope.selectedCredentials.machine && - parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { + parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) { updateMachineCredentialList(); } else { uncheckAllCredentials(); @@ -193,7 +193,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' $scope.credentials.length > 0) { if($scope.selectedCredentials && $scope.selectedCredentials.machine && - parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { + parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) { updateMachineCredentialList(); } else if($scope.selectedCredentials && $scope.selectedCredentials.vault && @@ -202,7 +202,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' } else if($scope.selectedCredentials && $scope.selectedCredentials.extra && $scope.selectedCredentials.extra.length > 0 && - parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { + parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) { updateExtraCredentialsList(); } else { uncheckAllCredentials(); @@ -216,7 +216,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile' }); $scope.toggle_row = function(selectedRow) { - if(parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { + if(parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) { if($scope.selectedCredentials && $scope.selectedCredentials.machine && $scope.selectedCredentials.machine.id === selectedRow.id) {