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

generalize secret textarea hint

Browse Source
This commit is contained in:
Jake McDermott
2019-03-22 09:36:06 -04:00
parent cb238c1f24
commit 956f588fd8
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/credential_plugins/aim.py
View File

@@ -26,18 +26,19 @@ aim_inputs = {
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'multiline': True, 'multiline': True,
'format': 'ssh_private_key',
}, { }, {
'id': 'client_cert', 'id': 'client_cert',
'label': _('Client Cert'), 'label': _('Client Certificate'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'multiline': True, 'multiline': True,
'format': 'ssh_private_key',
}, { }, {
'id': 'verify', 'id': 'verify',
'type': 'boolean', 'type': 'boolean',
'default': True, 'default': True,
'label': _('Verify'), 'label': _('Verify SSL Certificates'),
'help_text': _('Verify SSL certificates for HTTPS requests'),
}], }],
'metadata': [{ 'metadata': [{
'id': 'safe', 'id': 'safe',

2
awx/ui/client/lib/components/components.strings.js
View File

@@ -40,7 +40,7 @@ function ComponentsStrings (BaseString) {
}; };
ns.textarea = { ns.textarea = {
SSH_KEY_HINT: t.s('HINT: Drag and drop an SSH private key file on the field below.') SSH_KEY_HINT: t.s('HINT: Drag and drop private file on the field below.')
}; };
ns.lookup = { ns.lookup = {

1
awx/ui/client/lib/components/input/group.directive.js
View File

@@ -99,6 +99,7 @@ function AtInputGroupController ($scope, $compile) {
if (input.secret) { if (input.secret) {
config._component = 'at-input-textarea-secret'; config._component = 'at-input-textarea-secret';
input.format = 'ssh_private_key';
} else { } else {
config._component = 'at-input-textarea'; config._component = 'at-input-textarea';
} }

2
awx/ui/client/lib/components/input/textarea-secret.partial.html
View File

@@ -1,7 +1,7 @@
<div class="col-sm-{{::col}} at-InputContainer"> <div class="col-sm-{{::col}} at-InputContainer">
<div class="form-group at-u-flat"> <div class="form-group at-u-flat">
<at-input-label></at-input-label> <at-input-label></at-input-label>
<div ng-class="{ 'input-group': state.tagMode }"> <div class="input-group">
<div class="input-group-btn at-InputGroup-button input-group-prepend" ng-show="state.tagMode"> <div class="input-group-btn at-InputGroup-button input-group-prepend" ng-show="state.tagMode">
<button <button
class="btn at-ButtonHollow--white at-Input-button--long-sm" class="btn at-ButtonHollow--white at-Input-button--long-sm"