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

Fixed ask password on launch bug

Browse Source
This commit is contained in:
Michael Abashian
2017-07-11 14:00:00 -04:00
parent bc869284f7
commit 73f0fd8baf
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,11 +104,11 @@ export default
} }
} }
else { else {
if($scope.selected_credentials.machine.kind === "ssh"){ if($scope.selected_credentials.machine.credential_type === 1){
$scope.ssh_password_required = ($scope.selected_credentials.machine.password === "ASK") ? true : false; $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.ssh_key_unlock === "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.become_password === "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.vault_password === "ASK") ? true : false; $scope.vault_password_required = ($scope.selected_credentials.machine.inputs && $scope.selected_credentials.machine.inputs.vault_password === "ASK") ? true : false;
} }
else { else {
clearRequiredPasswords(); clearRequiredPasswords();

28
awx/ui/client/src/job-submission/job-submission.partial.html
View File

@@ -91,8 +91,8 @@
<div class="JobSubmission-instructions" translate>Launching this job requires the passwords listed below. Enter and confirm each password before continuing.</div> <div class="JobSubmission-instructions" translate>Launching this job requires the passwords listed below. Enter and confirm each password before continuing.</div>
<form name="forms.credentialpasswords" autocomplete="off" novalidate> <form name="forms.credentialpasswords" autocomplete="off" novalidate>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_password_required"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_password_required">
<label for="ssh_password"> <label for="ssh_password" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk" translate> Password</span> <span class="Form-inputLabel" translate> Password</span>
</label> </label>
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
@@ -104,8 +104,8 @@
<div class="error api-error" ng-bind="ssh_password_api_error"></div> <div class="error api-error" ng-bind="ssh_password_api_error"></div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_key_unlock_required"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ssh_key_unlock_required">
<label for="ssh_key_unlock"> <label for="ssh_key_unlock" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk" translate> Private Key Passphrase</span> <span class="Form-inputLabel" translate> Private Key Passphrase</span>
</label> </label>
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
@@ -117,8 +117,8 @@
<div class="error api-error" ng-bind="ssh_key_unlock_api_error"></div> <div class="error api-error" ng-bind="ssh_key_unlock_api_error"></div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="become_password_required"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="become_password_required">
<label for="become_password"> <label for="become_password" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk" translate> Privilege Escalation Password</span> <span class="Form-inputLabel" translate> Privilege Escalation Password</span>
</label> </label>
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
@@ -130,8 +130,8 @@
<div class="error api-error" ng-bind="become_password_api_error"></div> <div class="error api-error" ng-bind="become_password_api_error"></div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="vault_password_required"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="vault_password_required">
<label for="vault_password"> <label for="vault_password" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk" translate> Vault Password</span> <span class="Form-inputLabel" translate> Vault Password</span>
</label> </label>
<div class="input-group"> <div class="input-group">
<span class="input-group-btn"> <span class="input-group-btn">
@@ -166,8 +166,8 @@
</div> </div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_verbosity_on_launch"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_verbosity_on_launch">
<label for="verbosity"> <label for="verbosity" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk"> Verbosity</span> <span class="Form-inputLabel"> Verbosity</span>
</label> </label>
<div> <div>
<select <select
@@ -184,8 +184,8 @@
</div> </div>
</div> </div>
<div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_job_type_on_launch"> <div class="form-group Form-formGroup Form-formGroup--singleColumn" ng-if="ask_job_type_on_launch">
<label for="job_type"> <label for="job_type" class="prepend-asterisk Form-inputLabelContainer">
<span class="Form-inputLabel prepend-asterisk" translate> Job Type</span> <span class="Form-inputLabel" translate> Job Type</span>
</label> </label>
<div> <div>
<select <select
@@ -249,8 +249,8 @@
<div ng-if="survey_enabled" ng-show="step === 'survey'" class="JobSubmission-form"> <div ng-if="survey_enabled" ng-show="step === 'survey'" class="JobSubmission-form">
<form name="forms.survey" autocomplete="off" novalidate> <form name="forms.survey" autocomplete="off" novalidate>
<div ng-repeat="question in survey_questions" id="taker_'+question.index+'" class="form-group Form-formGroup Form-formGroup--singleColumn"> <div ng-repeat="question in survey_questions" id="taker_'+question.index+'" class="form-group Form-formGroup Form-formGroup--singleColumn">
<label ng-attr-for="{{question.variable}}"> <label ng-attr-for="{{question.variable}}" class="Form-inputLabelContainer" ng-class="{'prepend-asterisk': question.required===true}">
<span class="label-text Form-inputLabel" ng-class="{'prepend-asterisk': question.required===true}"> {{question.question_name}}</span> <span class="label-text Form-inputLabel"> {{question.question_name}}</span>
</label> </label>
<div class="survey_taker_description" ng-if="question.question_description"> <div class="survey_taker_description" ng-if="question.question_description">