shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 09:51:09 +03:00
Code Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/static/js/controllers/Credentials.js
View File

@ -373,9 +373,6 @@ function CredentialsEdit ($scope, $rootScope, $compile, $location, $log, $routeP
scope['ssh_password'] = data.password;
master['ssh_password'] = scope['ssh_password'];
break;
case 'scm':
scope['scm_key_unlock'] = data['ssh_key_unlock'];
break;
case 'rax':
scope['api_key'] = data['password'];
master['api_key'] = scope['api_key'];

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',

3
awx/ui/static/js/helpers/Credentials.js
View File

@ -134,9 +134,6 @@ angular.module('CredentialsHelper', ['Utilities'])
data['username'] = scope['access_key'];
data['password'] = scope['secret_key'];
break;
case 'scm':
data['ssh_key_unlock'] = scope['scm_key_unlock'];
break;
case 'rax':
data['password'] = scope['api_key'];
break;

4
awx/ui/static/lib/ansible/form-generator.js
View File

@ -525,7 +525,9 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies', 'Utilities'])
html += " ><i class=\"icon-undo\"></i></button>\n";
html += "</span>\n</div>\n";
if (field.ask) {
html += "<label class=\"checkbox-inline ask-checkbox\">";
html += "<label class=\"checkbox-inline ask-checkbox\" ";
html += (field.askShow) ? "ng-show=\"" + field.askShow + "\" " : "";
html += ">";
html += "<input type=\"checkbox\" ng-model=\"" +
fld + "_ask\" ng-change=\"ask('" + fld + "','" + field.associated + "')\" ";
html += "id=\"" + this.form.name + "_" + fld + "_ask_chbox\" ";