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

Removed logic comparing credential_type integer

Browse Source
This commit is contained in:
Michael Abashian
2017-07-11 19:20:40 -04:00
parent 690cb4ed6d
commit 2a3235690e
1 changed files with 27 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
awx/ui/client/src/job-submission/job-submission.controller.js
View File

@@ -73,49 +73,10 @@ export default
$scope.ssh_password_required = false; $scope.ssh_password_required = false;
$scope.ssh_key_unlock_required = false; $scope.ssh_key_unlock_required = false;
$scope.become_password_required = false; $scope.become_password_required = false;
$scope.vault_password_required = false;
$scope.ssh_password = ""; $scope.ssh_password = "";
$scope.ssh_key_unlock = ""; $scope.ssh_key_unlock = "";
$scope.become_password = ""; $scope.become_password = "";
$scope.vault_password = "";
};
var updateRequiredPasswords = function() {
if($scope.selected_credentials.machine) {
if($scope.selected_credentials.machine.id === $scope.defaults.credential.id) {
clearRequiredPasswords();
for(var i=0; i<$scope.passwords_needed_to_start.length; i++) {
var password = $scope.passwords_needed_to_start[i];
switch(password) {
case "ssh_password":
$scope.ssh_password_required = true;
break;
case "ssh_key_unlock":
$scope.ssh_key_unlock_required = true;
break;
case "become_password":
$scope.become_password_required = true;
break;
case "vault_password":
$scope.vault_password_required = true;
break;
}
}
}
else {
if(parseInt($scope.selected_credentials.machine.credential_type) === 1){
$scope.ssh_password_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.password === "ASK") ? true : false;
$scope.ssh_key_unlock_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.ssh_key_unlock === "ASK") ? true : false;
$scope.become_password_required = $scope.selected_credentials.machine.inputs && ($scope.selected_credentials.machine.inputs.become_password === "ASK") ? true : false;
$scope.vault_password_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.vault_password === "ASK") ? true : false;
}
else {
clearRequiredPasswords();
}
}
}
}; };
var launchJob = function() { var launchJob = function() {
@@ -158,7 +119,33 @@ export default
} }
$scope.$watch('selected_credentials.machine', function(){ $scope.$watch('selected_credentials.machine', function(){
updateRequiredPasswords(); if($scope.selected_credentials.machine) {
if($scope.selected_credentials.machine.id === $scope.defaults.credential.id) {
clearRequiredPasswords();
for(var i=0; i<$scope.passwords_needed_to_start.length; i++) {
var password = $scope.passwords_needed_to_start[i];
switch(password) {
case "ssh_password":
$scope.ssh_password_required = true;
break;
case "ssh_key_unlock":
$scope.ssh_key_unlock_required = true;
break;
case "become_password":
$scope.become_password_required = true;
break;
}
}
}
else {
$scope.ssh_password_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.password === "ASK") ? true : false;
$scope.ssh_key_unlock_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.ssh_key_unlock === "ASK") ? true : false;
$scope.become_password_required = $scope.selected_credentials.machine.inputs && ($scope.selected_credentials.machine.inputs.become_password === "ASK") ? true : false;
}
}
else {
clearRequiredPasswords();
}
}); });
// Get the job or job_template record // Get the job or job_template record