External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-26 13:25:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

AC-537 Some UI field/name changes for cloud credentials.

Browse Source
This commit is contained in:
Chris Church
2013-10-29 15:34:21 -04:00
parent f946026ca7
commit d668991899
9 changed files with 91 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,31 +28,37 @@ angular.module('CredentialFormDefinition', [])
addRequired: false,
editRequired: false
},
"ssh_username": {
label: 'SSH Username',
kind: {
label: 'Kind',
type: 'radio', // FIXME: Make select, pull from OPTIONS request
options: [{ label: 'Machine', value: 'ssh' }, { label: 'SCM', value: 'scm'}, { label: 'AWS', value: 'aws'}, { label: 'Rackspace', value: 'rax'}],
//ngChange: 'selectCategory()'
},
"username": {
label: 'Username',
type: 'text',
addRequired: false,
editRequired: false,
autocomplete: false
},
"ssh_password": {
label: 'SSH Password',
"password": {
label: 'Password',
type: 'password',
addRequired: false,
editRequired: false,
ngChange: "clearPWConfirm('ssh_password_confirm')",
ngChange: "clearPWConfirm('password_confirm')",
ask: true,
clear: true,
associated: 'ssh_password_confirm',
associated: 'password_confirm',
autocomplete: false
},
"ssh_password_confirm": {
label: 'Confirm SSH Password',
"password_confirm": {
label: 'Confirm Password',
type: 'password',
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'ssh_password',
associated: 'password',
autocomplete: false
},
"ssh_key_data": {

14
awx/ui/static/js/forms/Groups.js
View File

@@ -112,7 +112,17 @@ angular.module('GroupFormDefinition', [])
type: 'text',
awRequiredWhen: {variable: "sourcePathRequired", init: "false" }
},
source_username: {
credential: { // FIXME: Lookup doesn't work yet!
label: 'Cloud Credential',
type: 'lookup',
sourceModel: 'credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
addRequired: false,
editRequired: false,
column: 1
},
/*source_username: {
labelBind: 'sourceUsernameLabel',
excludeModal: true,
type: 'text',
@@ -141,7 +151,7 @@ angular.module('GroupFormDefinition', [])
awPassMatch: true,
associated: 'source_password',
autocomplete: false
},
},*/
source_regions: {
label: 'Regions',
excludeModal: true,

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

@@ -72,7 +72,7 @@ angular.module('JobTemplateFormDefinition', [])
awRequiredWhen: {variable: "playbookrequired", init: "true" },
column: 1
},
credential: {
credential: { // FIXME: Lookup only credentials with kind=ssh
label: 'Credential',
type: 'lookup',
sourceModel: 'credential',
@@ -82,6 +82,16 @@ angular.module('JobTemplateFormDefinition', [])
editRequired: false,
column: 1
},
cloud_credential: { // FIXME: Lookup only credentials with kind=aws/rax
label: 'Cloud Credential',
type: 'lookup',
sourceModel: 'cloud_credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
addRequired: false,
editRequired: false,
column: 1
},
forks: {
label: 'Forks',
id: 'forks-number',

12
awx/ui/static/js/forms/Jobs.js
View File

@@ -99,7 +99,7 @@ angular.module('JobFormDefinition', [])
editRequired: true,
column: 1
},
credential: {
credential: { // FIXME: Lookup only credentials with kind=ssh
label: 'Credential',
type: 'lookup',
sourceModel: 'credential',
@@ -109,6 +109,16 @@ angular.module('JobFormDefinition', [])
editRequired: false,
column: 1
},
cloud_credential: { // FIXME: Lookup only credentials with kind=aws/rax
label: 'Cloud Credential',
type: 'lookup',
sourceModel: 'cloud_credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
addRequired: false,
editRequired: false,
column: 1
},
forks: {
label: 'Forks',
id: 'forks-number',

13
awx/ui/static/js/forms/Projects.js
View File

@@ -128,7 +128,16 @@ angular.module('ProjectFormDefinition', [])
addRequired: false,
editRequired: false
},
auth_required: {
credential: { // FIXME: Lookup doesn't work yet!
label: 'SCM Credential',
type: 'lookup',
sourceModel: 'credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
addRequired: false,
editRequired: false,
},
/*auth_required: {
label: 'Authorization required?',
type: 'checkbox',
ngShow: "scm_type !== '' && scm_type !== null",
@@ -194,7 +203,7 @@ angular.module('ProjectFormDefinition', [])
editRequired: false,
awPassMatch: true,
associated: 'scm_key_unlock'
},
},*/
checkbox_group: {
label: 'SCM Options',
type: 'checkbox_group',