From 5bb241bfd4275c9df1f857a352da9e6d482712d1 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 26 Feb 2016 10:42:07 -0500 Subject: [PATCH 1/2] Added resource name and related field to the roles listed in an access_list --- awx/api/serializers.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index cd5e80dac6..bbd2e1fa68 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1532,7 +1532,14 @@ class ResourceAccessListElementSerializer(UserSerializer): ret['summary_fields']['permissions'] = resource.get_permissions(user) 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['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_access_roles = user.roles.filter(id__in=direct_permissive_role_ids).all() From 9c1694f187f4b06d2a1a2e38304d2756ac309a71 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 26 Feb 2016 10:46:01 -0500 Subject: [PATCH 2/2] Added resource type to our roles in our access list --- awx/api/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index bbd2e1fa68..25e438858c 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1535,6 +1535,7 @@ class ResourceAccessListElementSerializer(UserSerializer): 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