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

Fixed form-generator and awRequiredWhen directive to not overlap when setting * on required field labels. Fixed job submission to work with new cloud credential implementation.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-04 04:03:55 +00:00
committed by Chris Church
parent 0466629718
commit bac22205a8
12 changed files with 280 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,15 +75,15 @@ angular.module('CredentialFormDefinition', [])
label: 'Access Key',
type: 'text',
ngShow: "kind.value == 'aws'",
awRequiredWhen: { variable: "aws_required", init: "false" },
awRequiredWhen: { variable: "aws_required", init: false },
autocomplete: false,
apiField: 'username'
},
secret_key: {
label: 'Secrent Key',
label: 'Secret Key',
type: 'password',
ngShow: "kind.value == 'aws'",
awRequiredWhen: { variable: "aws_required", init: "false" },
awRequiredWhen: { variable: "aws_required", init: false },
autocomplete: false,
ask: false,
clear: false,
@@ -97,9 +97,9 @@ angular.module('CredentialFormDefinition', [])
autocomplete: false
},
"password": {
labelBind: 'passwordLabel',
label: 'Password',
type: 'password',
ngShow: "kind.value && kind.value !== 'aws'",
ngShow: "kind.value == 'rax' || kind.value == 'scm'",
awRequiredWhen: {variable: 'rackspace_required', init: false },
ngChange: "clearPWConfirm('password_confirm')",
ask: false,
@@ -108,15 +108,37 @@ angular.module('CredentialFormDefinition', [])
autocomplete: false
},
"password_confirm": {
labelBind: 'passwordConfirmLabel',
label: 'Confirm Password',
type: 'password',
ngShow: "kind.value && kind.value !== 'aws'",
ngShow: "kind.value == 'rax' || kind.value == 'scm'",
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'password',
autocomplete: false
},
"ssh_password": {
label: 'SSH Password',
type: 'password',
ngShow: "kind.value == 'ssh'",
ngChange: "clearPWConfirm('password_confirm')",
addRequired: false,
editRequired: false,
ask: true,
clear: true,
associated: 'ssh_password_confirm',
autocomplete: false
},
"ssh_password_confirm": {
label: 'Confirm SSH Password',
type: 'password',
ngShow: "kind.value == 'ssh'",
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'ssh_password',
autocomplete: false
},
"ssh_key_data": {
labelBind: 'sshKeyDataLabel',
type: 'textarea',

2
awx/ui/static/js/forms/JobTemplates.js
View File

@@ -87,7 +87,7 @@ angular.module('JobTemplateFormDefinition', [])
type: 'lookup',
sourceModel: 'cloud_credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
ngClick: 'lookUpCloudcredential()',
addRequired: false,
editRequired: false,
column: 1