zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-01 12:21:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-741 scm and machine type credentials now sharing ssh_key_unlock field in Credential form definition. Originally split because only machine should allow Ask option. Added new askShow option to form generator so that Ask checkbox gets an ng-show directive.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-12-02 18:48:27 +00:00
parent 9e4fbe88b8
commit a21a740bad
4 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
awx/ui/static/js/forms/Credentials.js
View File

@@ -194,43 +194,24 @@ angular.module('CredentialFormDefinition', [])
"ssh_key_unlock": {
label: 'Key Password',
type: 'password',
ngShow: "kind.value == 'ssh'",
ngShow: "kind.value == 'ssh' || kind.value == 'scm'",
addRequired: false,
editRequired: false,
ngChange: "clearPWConfirm('ssh_key_unlock_confirm')",
associated: 'ssh_key_unlock_confirm',
ask: true,
askShow: "kind.value == 'ssh'", //Only allow ask for machine credentials
clear: true
},
"ssh_key_unlock_confirm": {
label: 'Confirm Key Password',
type: 'password',
ngShow: "kind.value == 'ssh'",
ngShow: "kind.value == 'ssh' || kind.value == 'scm'",
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'ssh_key_unlock'
},
"scm_key_unlock": {
label: 'Key Password',
type: 'password',
ngShow: "kind.value == 'scm'",
addRequired: false,
editRequired: false,
ngChange: "clearPWConfirm('scm_key_unlock_confirm')",
associated: 'scm_key_unlock_confirm',
ask: false,
clear: true
},
"scm_key_unlock_confirm": {
label: 'Confirm Key Password',
type: 'password',
ngShow: "kind.value == 'scm'",
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'scm_key_unlock'
},
"sudo_username": {
label: 'Sudo Username',
type: 'text',