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

Merge pull request #2605 from jakemcdermott/fix-2601

Browse Source 
remove admin and member roles from organization->team permissions 

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-06 17:08:43 +00:00 committed by GitHub
commit 856dc3645e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/access/add-rbac-resource/rbac-resource.controller.js
View File

@ -27,6 +27,17 @@ export default ['$rootScope', '$scope', 'GetBasePath', 'Rest', '$q', 'Wait', 'Pr
// array for all possible roles for the object
scope.roles = scope.object.summary_fields.object_roles;
const objectType = _.get(scope, ['object', 'type']);
const teamRoles = _.get(scope, ['object', 'summary_fields', 'object_roles'], {});
if (objectType === 'organization') {
// some organization object_roles aren't allowed for teams
delete teamRoles.admin_role;
delete teamRoles.member_role;
}
scope.teamRoles = teamRoles;
// TODO: get working with api
// array w roles and descriptions for key
scope.roleKey = Object

2
awx/ui/client/src/access/add-rbac-resource/rbac-resource.partial.html
View File

@ -88,7 +88,7 @@
{{ obj.type }}
</span>
</div>
<rbac-multiselect-role class="AddPermissions-roleSelect" roles="roles" model="obj.roles">
<rbac-multiselect-role class="AddPermissions-roleSelect" roles="tab.teams ? teamRoles : roles" model="obj.roles">
</rbac-multiselect-role>
<button class="AddPermissions-roleRemove"
ng-click="removeObject(obj)">