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

Fixes to teams/project/organizations/users/credentials navigation and pathing.

Browse Source
This commit is contained in:
chouseknecht
2013-05-22 14:19:51 -04:00
parent 91b534c841
commit 45a4ba7743
16 changed files with 305 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ansibleworks/ui/static/js/forms/Credentials.js
View File

@@ -57,7 +57,8 @@ angular.module('CredentialFormDefinition', [])
type: 'textarea',
addRequired: false,
editRequired: false,
rows: 10
rows: 10,
class: 'span10'
},
"ssh_key_unlock": {
label: 'Key Password',
@@ -100,25 +101,26 @@ angular.module('CredentialFormDefinition', [])
editRequired: false,
awPassMatch: true,
associated: 'sudo_password'
},
user: {
label: 'User',
type: 'lookup',
sourceModel: 'user',
sourceField: 'username',
addRequired: false,
editRequired: false,
ngClick: 'lookUpUser()'
},
team: {
label: 'Team',
type: 'lookup',
sourceModel: 'team',
sourceField: 'name',
addRequired: false,
editRequired: false,
ngClick: 'lookUpTeam()'
}
// ,
// user: {
// label: 'User',
// type: 'lookup',
// sourceModel: 'user',
// sourceField: 'username',
// addRequired: false,
// editRequired: false,
// ngClick: 'lookUpUser()'
// },
// team: {
// label: 'Team',
// type: 'lookup',
// sourceModel: 'team',
// sourceField: 'name',
// addRequired: false,
// editRequired: false,
// ngClick: 'lookUpTeam()'
// }
},
buttons: { //for now always generates <button> tags

20
ansibleworks/ui/static/js/forms/Users.js
View File

@@ -158,6 +158,13 @@ angular.module('UserFormDefinition', [])
iterator: 'credential',
open: false,
actions: {
add: {
ngClick: "add('credentials')",
icon: 'icon-plus'
},
},
fields: {
name: {
key: true,
@@ -166,7 +173,20 @@ angular.module('UserFormDefinition', [])
description: {
label: 'Description'
}
},
fieldActions: {
edit: {
ngClick: "edit('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}')",
icon: 'icon-edit'
},
delete: {
ngClick: "delete('credentials', \{\{ credential.id \}\}, '\{\{ credential.name \}\}', 'credentials')",
icon: 'icon-remove',
class: 'btn-danger'
}
}
},
}