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

changing the related tab on an edit of an organization to be for users, instead of users & teams

Browse Source
This commit is contained in:
jaredevantabor
2017-02-07 17:17:03 -08:00
parent 48e75b3e19
commit a7a968e0fa
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/ui/client/src/forms/Organizations.js
View File

@@ -53,25 +53,23 @@ export default
}, },
related: { related: {
permissions: { users: {
name: 'permissions', dataPlacement: 'top',
awToolTip: i18n._('Please save before assigning permissions'), awToolTip: i18n._('Please save before adding users'),
basePath: 'api/v1/organizations/{{$stateParams.organization_id}}/access_list/', basePath: 'api/v1/organizations/{{$stateParams.organization_id}}/access_list/',
search: { search: {
order_by: 'username' order_by: 'username'
}, },
dataPlacement: 'top',
type: 'collection', type: 'collection',
title: i18n._('Users & Teams'), title: i18n._('Users'),
iterator: 'permission', iterator: 'user',
index: false, index: false,
open: false, open: false,
searchType: 'select',
actions: { actions: {
add: { add: {
ngClick: "$state.go('.add')", ngClick: "$state.go('.add')",
label: i18n._('Add'), label: i18n._('Add'),
awToolTip: i18n._('Add Users and or Teams to this organization.'), awToolTip: i18n._('Add Users to this organization.'),
actionClass: 'btn List-buttonSubmit', actionClass: 'btn List-buttonSubmit',
buttonContent: '+ ' + i18n._('ADD'), buttonContent: '+ ' + i18n._('ADD'),
ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)' ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -90,12 +88,6 @@ export default
type: 'role', type: 'role',
nosort: true, nosort: true,
class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4' class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4'
},
team_roles: {
label: i18n._('Team Roles'),
type: 'team_roles',
nosort: true,
class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4'
} }
} }
}, },

2
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -548,7 +548,7 @@ export default ['$injector', '$stateExtender', '$log', 'i18n', function($injecto
} }
} }
else if (field.iterator === 'user' && field.actions && field.actions.add) { else if (field.iterator === 'user' && field.actions && field.actions.add) {
if(form.name === 'team') { if(form.name === 'team' || form.name === 'organization') {
states.push(buildRbacUserDirective()); states.push(buildRbacUserDirective());
} }
} }