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

Added Owner radio button to Credential detail page. Lookup for Credential on Groups page is working now.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-01 21:28:05 +00:00
committed by Chris Church
parent 6a7d8b52aa
commit f327be5811
7 changed files with 103 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,18 +28,28 @@ angular.module('CredentialFormDefinition', [])
addRequired: false,
editRequired: false
},
owner: {
label: 'Owned By?',
type: 'radio',
ngChange: "ownerChange()",
options: [
{ label: 'User', value: 'user' },
{ label: 'Team', value: 'team' }
],
awPopOver: "<p>A credential must be associated with either a user or a team. Choosing a user allows only the selected user access " +
"to the credential. Choosing a team shares the credential with all team members.</p>",
dataTitle: 'Owner',
dataPlacement: 'right',
dataContainer: "body",
},
user: {
label: 'User',
type: 'lookup',
sourceModel: 'user',
sourceField: 'username',
ngClick: 'lookUpUser()',
ngShow: "team == '' || team == null",
awPopOver: "<p>A credential must be associated with either a user or a team. Choosing a user allows only the selected user access " +
"to the credential.</p>",
dataTitle: 'User',
dataPlacement: 'right',
dataContainer: "body"
ngShow: "owner == 'user'",
awRequiredWhen: { variable: "user_required", init: "false" }
},
team: {
label: 'Team',
@@ -47,12 +57,8 @@ angular.module('CredentialFormDefinition', [])
sourceModel: 'team',
sourceField: 'name',
ngClick: 'lookUpTeam()',
ngShow: "user == '' || user == null",
awPopOver: "<p>A credential must be associated with either a user or a team. Choose a team to share a credential with " +
"all users in the team.</p>",
dataTitle: 'Team',
dataPlacement: 'right',
dataContainer: "body"
ngShow: "owner == 'team'",
awRequiredWhen: { variable: "team_required", init: "false" }
},
kind: {
label: 'Type',
@@ -67,7 +73,7 @@ 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'
},
@@ -75,7 +81,7 @@ angular.module('CredentialFormDefinition', [])
label: 'Secrent 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,

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

@@ -112,46 +112,16 @@ angular.module('GroupFormDefinition', [])
type: 'text',
awRequiredWhen: {variable: "sourcePathRequired", init: "false" }
},
credential: { // FIXME: Lookup doesn't work yet!
credential: {
label: 'Cloud Credential',
type: 'lookup',
ngShow: "source.value !== ''",
sourceModel: 'credential',
sourceField: 'name',
ngClick: 'lookUpCredential()',
addRequired: false,
editRequired: false,
column: 1
editRequired: false
},
/*source_username: {
labelBind: 'sourceUsernameLabel',
excludeModal: true,
type: 'text',
ngShow: "source.value == 'rackspace' || source.value == 'ec2'",
awRequiredWhen: {variable: "sourceUsernameRequired", init: "false" }
},
source_password: {
labelBind: 'sourcePasswordLabel',
excludeModal: true,
type: 'password',
ngShow: "source.value == 'rackspace' || source.value == 'ec2'",
editRequired: false,
addRequired: false,
ngChange: "clearPWConfirm('source_password_confirm')",
ask: true,
clear: true,
associated: 'source_password_confirm',
autocomplete: false
},
source_password_confirm: {
labelBind: 'sourcePasswordConfirmLabel',
type: 'password',
ngShow: "source.value == 'rackspace' || source.value == 'ec2'",
addRequired: false,
editRequired: false,
awPassMatch: true,
associated: 'source_password',
autocomplete: false
},*/
source_regions: {
label: 'Regions',
excludeModal: true,