From 5043ff45c244e0a095a022ca91be4d6045211f55 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Tue, 28 Jun 2016 10:13:40 -0400 Subject: [PATCH] Removed active_roles The UI isn't using this feature at the moment so we're going to remove it for 3.0, and probably bring it back in 3.1, potentially in different ways depending on UI needs then. --- awx/api/serializers.py | 4 ---- awx/main/tests/functional/test_rbac_api.py | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 2d2a43c51a..ac481a5277 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -318,9 +318,6 @@ class BaseSerializer(serializers.ModelSerializer): summary_fields['modified_by'][field] = getattr(obj.modified_by, field) # RBAC summary fields - request = self.context.get('request', None) - if request and isinstance(obj, ResourceMixin) and request.user.is_authenticated(): - summary_fields['active_roles'] = obj.get_permissions(request.user) roles = {} for field in obj._meta.get_fields(): if type(field) is ImplicitRoleField: @@ -1524,7 +1521,6 @@ class ResourceAccessListElementSerializer(UserSerializer): if 'summary_fields' not in ret: ret['summary_fields'] = {} - ret['summary_fields']['active_roles'] = get_roles_on_resource(obj, user) def format_role_perm(role): role_dict = { 'id': role.id, 'name': role.name, 'description': role.description} diff --git a/awx/main/tests/functional/test_rbac_api.py b/awx/main/tests/functional/test_rbac_api.py index b3c75a4a2d..dd65095f21 100644 --- a/awx/main/tests/functional/test_rbac_api.py +++ b/awx/main/tests/functional/test_rbac_api.py @@ -416,17 +416,6 @@ def test_ensure_rbac_fields_are_present(organization, get, admin): role = org_role_response.data assert role['related']['organization'] == url -@pytest.mark.django_db -def test_ensure_permissions_is_present(organization, get, user): - url = reverse('api:organization_detail', args=(organization.id,)) - response = get(url, user('admin', True)) - assert response.status_code == 200 - org = response.data - - assert 'summary_fields' in org - assert 'active_roles' in org['summary_fields'] - assert 'read_role' in org['summary_fields']['active_roles'] - @pytest.mark.django_db def test_ensure_role_summary_is_present(organization, get, user): url = reverse('api:organization_detail', args=(organization.id,))