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

Merge pull request #60 from jaredevantabor/submit-only-vault-cred

Browse Source 
allowing job submission to submit only a vault cred
This commit is contained in:
Jared Tabor
2017-07-26 08:43:50 -07:00
committed by GitHub
parent 963ded4594 6f51571550
commit 0628985374
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/job-submission/job-submission.block.less
View File

@@ -243,6 +243,9 @@
align-items: flex-start; align-items: flex-start;
} }
.JobSubmission-previewTagLabel { .JobSubmission-previewTagLabel {
color: @default-interface-txt;
}
.JobSubmission-previewTagLabel--deletable{
color: @default-list-header-bg; color: @default-list-header-bg;
} }
.JobSubmission-previewTagRevert { .JobSubmission-previewTagRevert {

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

@@ -164,6 +164,7 @@ export default
$scope.has_default_inventory = data.defaults && data.defaults.inventory && data.defaults.inventory.id; $scope.has_default_inventory = data.defaults && data.defaults.inventory && data.defaults.inventory.id;
$scope.has_default_credential = data.defaults && data.defaults.credential && data.defaults.credential.id; $scope.has_default_credential = data.defaults && data.defaults.credential && data.defaults.credential.id;
$scope.has_default_vault_credential = data.defaults && data.defaults.vault_credential && data.defaults.vault_credential.id; $scope.has_default_vault_credential = data.defaults && data.defaults.vault_credential && data.defaults.vault_credential.id;
$scope.vault_password_required = ($scope.password_needed && data.passwords_needed_to_start.includes('vault_password'));
$scope.has_default_extra_credentials = data.defaults && data.defaults.extra_credentials && data.defaults.extra_credentials.length > 0; $scope.has_default_extra_credentials = data.defaults && data.defaults.extra_credentials && data.defaults.extra_credentials.length > 0;
$scope.other_prompt_data = {}; $scope.other_prompt_data = {};
@@ -434,7 +435,7 @@ export default
} }
} }
else if($scope.step === "credential") { else if($scope.step === "credential") {
if($scope.selected_credentials.machine && $scope.forms.credentialpasswords && $scope.forms.credentialpasswords.$valid) { if(($scope.selected_credentials.machine || $scope.selected_credentials.vault) && $scope.forms.credentialpasswords && $scope.forms.credentialpasswords.$valid) {
return false; return false;
} }
else { else {

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

@@ -51,7 +51,7 @@
<div ng-if="ask_credential_on_launch || password_needed" ng-show="step === 'credential'" class="JobSubmission-form"> <div ng-if="ask_credential_on_launch || password_needed" ng-show="step === 'credential'" class="JobSubmission-form">
<div class="JobSubmission-selectedItemContainer"> <div class="JobSubmission-selectedItemContainer">
<div class="JobSubmission-selectedItem"> <div class="JobSubmission-selectedItem">
<div class="JobSubmission-selectedItemInfo" ng-hide="!selected_credentials.machine && selected_credentials.extra.length === 0"> <div class="JobSubmission-selectedItemInfo" ng-hide="!selected_credentials.machine && !selected_credentials.vault && selected_credentials.extra.length === 0">
<div class="JobSubmission-selectedItemLabel"> <div class="JobSubmission-selectedItemLabel">
<span translate>SELECTED:</span> <span translate>SELECTED:</span>
</div> </div>
@@ -62,7 +62,8 @@
<i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i> <i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i>
</div> </div>
<div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}"> <div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
<span><span class="JobSubmission-previewTagLabel">MACHINE</span>:&nbsp;{{selected_credentials.machine.name}}</span> <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
MACHINE</span>:&nbsp;{{selected_credentials.machine.name}}</span>
</div> </div>
</div> </div>
<div class="JobSubmission-previewTagContainer" ng-repeat="extraCredential in selected_credentials.extra"> <div class="JobSubmission-previewTagContainer" ng-repeat="extraCredential in selected_credentials.extra">
@@ -70,13 +71,14 @@
<i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i> <i class="fa fa-times JobSubmission-previewTagContainerTagDelete"></i>
</div> </div>
<div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}"> <div class="JobSubmission-previewTag" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
<span><span class="JobSubmission-previewTagLabel">{{credential_types[extraCredential.credential_type].name | uppercase}}</span>:&nbsp;{{extraCredential.name}}</span> <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
{{credential_types[extraCredential.credential_type].name | uppercase}}</span>:&nbsp;{{extraCredential.name}}</span>
</div> </div>
</div> </div>
<div class="JobSubmission-previewTagContainer JobSubmission-previewTagContainer--vault" ng-show="selected_credentials.vault"> <div class="JobSubmission-previewTagContainer JobSubmission-previewTagContainer--vault" ng-show="selected_credentials.vault">
<div class="JobSubmission-previewTag JobSubmission-previewTag--vault" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}"> <div class="JobSubmission-previewTag JobSubmission-previewTag--vault" ng-class="{'JobSubmission-previewTag--deletable': ask_credential_on_launch}">
<span> <span><span class="JobSubmission-previewTagLabel" ng-class="{'JobSubmission-previewTagLabel--deletable': ask_credential_on_launch}">
<span class="JobSubmission-previewTagLabel">VAULT</span>:&nbsp;{{selected_credentials.vault.name}}</span> VAULT</span>:&nbsp;{{selected_credentials.vault.name}}</span>
</div> </div>
</div> </div>
</div> </div>
@@ -340,7 +342,7 @@
<div class="JobSubmission-previewItem" ng-show="submitJobType === 'job_template'"> <div class="JobSubmission-previewItem" ng-show="submitJobType === 'job_template'">
<div class="JobSubmission-previewItemTitle" translate>CREDENTIAL</div> <div class="JobSubmission-previewItemTitle" translate>CREDENTIAL</div>
<div> <div>
<span ng-show="!selected_credentials.machine && selected_credentials.extra.length === 0" class="JobSubmission-selectedItemNone" translate>None selected</span> <span ng-show="!selected_credentials.machine && !selected_credentials.vault && selected_credentials.extra.length === 0" class="JobSubmission-selectedItemNone" translate>None selected</span>
</div> </div>
<div> <div>
<span ng-show="selected_credentials.machine" class="JobSubmission-previewItemSubTitle"><span translate>Machine</span>:&nbsp;</span> <span ng-show="selected_credentials.machine" class="JobSubmission-previewItemSubTitle"><span translate>Machine</span>:&nbsp;</span>