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

AC-910 Fixed project status icons. AC-915 Fixed permission form.

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-15 02:14:29 -05:00
parent 902008d17e
commit 46e5e078b6
4 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/static/js/forms/Permissions.js
View File

@@ -30,9 +30,12 @@ angular.module('PermissionFormDefinition', [])
fields: { fields: {
category: { category: {
label: 'Permission Type', label: '* Permission Type',
type: 'radio', type: 'radio_group',
options: [{ label: 'Inventory', value: 'Inventory' }, { label: 'Deployment', value: 'Deploy'}], options: [
{ label: 'Inventory', value: 'Inventory', selected: true },
{ label: 'Deployment', value: 'Deploy'}
],
ngChange: 'selectCategory()' ngChange: 'selectCategory()'
}, },
name: { name: {
@@ -74,17 +77,15 @@ angular.module('PermissionFormDefinition', [])
awRequiredWhen: {variable: "inventoryrequired", init: "true" } awRequiredWhen: {variable: "inventoryrequired", init: "true" }
}, },
permission_type: { permission_type: {
label: 'Permission', label: '* Permission',
type: 'radio', type: 'radio_group',
options: [ options: [
{label: 'Admin', value: 'admin', ngShow: "category == 'Inventory'" },
{label: 'Read', value: 'read', ngShow: "category == 'Inventory'" }, {label: 'Read', value: 'read', ngShow: "category == 'Inventory'" },
{label: 'Write', value: 'write', ngShow: "category == 'Inventory'" }, {label: 'Write', value: 'write', ngShow: "category == 'Inventory'" },
{label: 'Admin', value: 'admin', ngShow: "category == 'Inventory'" },
{label: 'Run', value: 'run', ngShow: "category == 'Deploy'" }, {label: 'Run', value: 'run', ngShow: "category == 'Deploy'" },
{label: 'Check', value: 'check', ngShow: "category == 'Deploy'" } {label: 'Check', value: 'check', ngShow: "category == 'Deploy'" }
], ],
addRequired: true,
editRequired: true,
helpCollapse: [{ hdr: 'Permission', ngBind: 'permissionTypeHelp' }] helpCollapse: [{ hdr: 'Permission', ngBind: 'permissionTypeHelp' }]
} }
}, },

6
awx/ui/static/js/helpers/Permissions.js
View File

@@ -18,12 +18,12 @@ angular.module('PermissionsHelper', [])
scope.projectrequired = false; scope.projectrequired = false;
scope.permissionTypeHelp = scope.permissionTypeHelp =
"<dl>\n" + "<dl>\n" +
"<dt>Admin</dt>\n" +
"<dd>Allow the user or team full access to the inventory. This includes reading, writing, deletion of the inventory and inventory sync operations.</dd>\n" +
"<dt>Read</dt>\n" + "<dt>Read</dt>\n" +
"<dd>Only allow the user or team to view the inventory.</dd>\n" + "<dd>Only allow the user or team to view the inventory.</dd>\n" +
"<dt>Write</dt>\n" + "<dt>Write</dt>\n" +
"<dd>Allow the user or team to modify hosts and groups contained in the inventory, add new hosts and groups, and perform inventory sync operations.\n" + "<dd>Allow the user or team to modify hosts and groups contained in the inventory, add new hosts and groups, and perform inventory sync operations.\n" +
"<dt>Admin</dt>\n" +
"<dd>Allow the user or team full access to the inventory. This includes reading, writing, deletion of the inventory and inventory sync operations.</dd>\n" +
"</dl>\n"; "</dl>\n";
} }
else { else {
@@ -40,7 +40,7 @@ angular.module('PermissionsHelper', [])
} }
if (reset) { if (reset) {
scope.permission_type = null; scope.permission_type = (scope.category == 'Inventory') ? 'read' : 'run'; //default to the first option
} }
} }

2
awx/ui/static/js/lists/Projects.js
View File

@@ -41,7 +41,7 @@ angular.module('ProjectsListDefinition', [])
ngClick: 'showSCMStatus(\{\{ project.id \}\})', ngClick: 'showSCMStatus(\{\{ project.id \}\})',
awToolTip: 'View details of last SCM Update', awToolTip: 'View details of last SCM Update',
dataPlacement: 'top', dataPlacement: 'top',
badgeIcon: "\{\{ 'icon-failures-' + project.badge \}\}", badgeIcon: "\{\{ 'fa icon-failures-' + project.badge \}\}",
badgePlacement: 'left', badgePlacement: 'left',
searchType: 'select', searchType: 'select',
searchOptions: [], // will be set by Options call to projects resource searchOptions: [], // will be set by Options call to projects resource

14
awx/ui/static/less/ansible-ui.less
View File

@@ -217,12 +217,14 @@ hr {
} }
.collapsible-help { .collapsible-help {
dl { margin-top: 20px;
margin-left: 15px; margin-bottom: 20px;
} dl {
dt { margin-left: 15px;
margin-top: 15px; }
} dt {
margin-top: 15px;
}
} }
th.actions-column, th.actions-column,