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

update ssh to machine

Browse Source
This commit is contained in:
John Mitchell
2017-07-24 13:58:00 -04:00
parent 2ce300aa1e
commit 4fe2f90689
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -70,9 +70,9 @@ export default
$scope.$watchCollection('selectedCredentials.extra', () => { $scope.$watchCollection('selectedCredentials.extra', () => {
if($scope.credentials && $scope.credentials.length > 0) { 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(); updateExtraCredentialsList();
} else if (parseInt($scope.credentialKind) !== credentialKinds.SSH) { } else if (parseInt($scope.credentialKind) !== credentialKinds.Machine) {
uncheckAllCredentials(); uncheckAllCredentials();
} }
} }
@@ -80,7 +80,7 @@ export default
$scope.$watch('selectedCredentials.machine', () => { $scope.$watch('selectedCredentials.machine', () => {
if($scope.credentials && $scope.credentials.length > 0) { 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(); updateMachineCredentialList();
} }
else { else {
@@ -91,10 +91,10 @@ export default
$scope.$watchGroup(['credentials', 'selectedCredentials.machine'], () => { $scope.$watchGroup(['credentials', 'selectedCredentials.machine'], () => {
if($scope.credentials && $scope.credentials.length > 0) { 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(); 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(); updateExtraCredentialsList();
} }
else { else {
@@ -105,7 +105,7 @@ export default
}; };
$scope.toggle_row = function(selectedRow) { $scope.toggle_row = function(selectedRow) {
if(parseInt($scope.credentialKind) === credentialKinds.SSH) { if(parseInt($scope.credentialKind) === credentialKinds.Machine) {
$scope.selectedCredentials.machine = _.cloneDeep(selectedRow); $scope.selectedCredentials.machine = _.cloneDeep(selectedRow);
} }
else { else {

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

@@ -14,14 +14,14 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
.then(kinds => { .then(kinds => {
scope.credentialKinds = kinds; scope.credentialKinds = kinds;
scope.credentialKind = "" + kinds.SSH; scope.credentialKind = "" + kinds.Machine;
scope.showModal = function() { scope.showModal = function() {
$('#multi-credential-modal').modal('show'); $('#multi-credential-modal').modal('show');
}; };
scope.destroyModal = function() { scope.destroyModal = function() {
scope.credentialKind = kinds.SSH; scope.credentialKind = kinds.Machine;
$('#multi-credential-modal').modal('hide'); $('#multi-credential-modal').modal('hide');
}; };
@@ -62,7 +62,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
let extraCredIds = $scope.selectedCredentials.extra let extraCredIds = $scope.selectedCredentials.extra
.map(cred => cred.id); .map(cred => cred.id);
$scope.credentials.forEach(cred => { $scope.credentials.forEach(cred => {
if (cred.credential_type !== $scope.credentialKinds.SSH) { if (cred.credential_type !== $scope.credentialKinds.Machine) {
cred.checked = (extraCredIds cred.checked = (extraCredIds
.indexOf(cred.id) > - 1) ? 1 : 0; .indexOf(cred.id) > - 1) ? 1 : 0;
} }
@@ -75,7 +75,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
let updateMachineCredentialList = function() { let updateMachineCredentialList = function() {
$scope.credentials.forEach(cred => { $scope.credentials.forEach(cred => {
if (cred.credential_type === $scope.credentialKinds.SSH) { if (cred.credential_type === $scope.credentialKinds.Machine) {
cred.checked = ($scope.selectedCredentials cred.checked = ($scope.selectedCredentials
.machine !== null && .machine !== null &&
cred.id === $scope.selectedCredentials cred.id === $scope.selectedCredentials
@@ -158,9 +158,9 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
if($scope.credentials && $scope.credentials.length > 0) { if($scope.credentials && $scope.credentials.length > 0) {
if($scope.selectedCredentials.extra && if($scope.selectedCredentials.extra &&
$scope.selectedCredentials.extra.length > 0 && $scope.selectedCredentials.extra.length > 0 &&
parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) {
updateExtraCredentialsList(); updateExtraCredentialsList();
} else if (parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { } else if (parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) {
uncheckAllCredentials(); uncheckAllCredentials();
} }
} }
@@ -169,7 +169,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
$scope.$watch('selectedCredentials.machine', () => { $scope.$watch('selectedCredentials.machine', () => {
if($scope.selectedCredentials && if($scope.selectedCredentials &&
$scope.selectedCredentials.machine && $scope.selectedCredentials.machine &&
parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) {
updateMachineCredentialList(); updateMachineCredentialList();
} else { } else {
uncheckAllCredentials(); uncheckAllCredentials();
@@ -193,7 +193,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
$scope.credentials.length > 0) { $scope.credentials.length > 0) {
if($scope.selectedCredentials && if($scope.selectedCredentials &&
$scope.selectedCredentials.machine && $scope.selectedCredentials.machine &&
parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) {
updateMachineCredentialList(); updateMachineCredentialList();
} else if($scope.selectedCredentials && } else if($scope.selectedCredentials &&
$scope.selectedCredentials.vault && $scope.selectedCredentials.vault &&
@@ -202,7 +202,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
} else if($scope.selectedCredentials && } else if($scope.selectedCredentials &&
$scope.selectedCredentials.extra && $scope.selectedCredentials.extra &&
$scope.selectedCredentials.extra.length > 0 && $scope.selectedCredentials.extra.length > 0 &&
parseInt($scope.credentialKind) !== $scope.credentialKinds.SSH) { parseInt($scope.credentialKind) !== $scope.credentialKinds.Machine) {
updateExtraCredentialsList(); updateExtraCredentialsList();
} else { } else {
uncheckAllCredentials(); uncheckAllCredentials();
@@ -216,7 +216,7 @@ export default ['templateUrl', 'Rest', 'GetBasePath', 'generateList', '$compile'
}); });
$scope.toggle_row = function(selectedRow) { $scope.toggle_row = function(selectedRow) {
if(parseInt($scope.credentialKind) === $scope.credentialKinds.SSH) { if(parseInt($scope.credentialKind) === $scope.credentialKinds.Machine) {
if($scope.selectedCredentials && if($scope.selectedCredentials &&
$scope.selectedCredentials.machine && $scope.selectedCredentials.machine &&
$scope.selectedCredentials.machine.id === selectedRow.id) { $scope.selectedCredentials.machine.id === selectedRow.id) {