mirror of
https://github.com/ansible/awx.git
synced 2026-03-20 18:37:39 -02:30
Merge pull request #1062 from anoek/rbac
Added some resource type and name information to the access list for the UI
This commit is contained in:
@@ -1532,7 +1532,15 @@ class ResourceAccessListElementSerializer(UserSerializer):
|
|||||||
ret['summary_fields']['permissions'] = resource.get_permissions(user)
|
ret['summary_fields']['permissions'] = resource.get_permissions(user)
|
||||||
|
|
||||||
def format_role_perm(role):
|
def format_role_perm(role):
|
||||||
return { 'role': { 'id': role.id, 'name': role.name}, 'permissions': resource.get_role_permissions(role)}
|
role_dict = { 'id': role.id, 'name': role.name}
|
||||||
|
try:
|
||||||
|
role_dict['resource_name'] = role.content_object.name
|
||||||
|
role_dict['resource_type'] = role.content_type.name
|
||||||
|
role_dict['related'] = reverseGenericForeignKey(role.content_object)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return { 'role': role_dict, 'permissions': resource.get_role_permissions(role)}
|
||||||
|
|
||||||
direct_permissive_role_ids = resource.permissions.values_list('role__id')
|
direct_permissive_role_ids = resource.permissions.values_list('role__id')
|
||||||
direct_access_roles = user.roles.filter(id__in=direct_permissive_role_ids).all()
|
direct_access_roles = user.roles.filter(id__in=direct_permissive_role_ids).all()
|
||||||
|
|||||||
Reference in New Issue
Block a user