External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2673 from anoek/active_roles_removal

Browse Source 
Removed active_roles
This commit is contained in:
Akita Noek
2016-06-28 11:29:29 -04:00
committed by GitHub
parent 5ed36624a3 5043ff45c2
commit 4a010a7479
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@@ -318,9 +318,6 @@ class BaseSerializer(serializers.ModelSerializer):
summary_fields['modified_by'][field] = getattr(obj.modified_by, field) summary_fields['modified_by'][field] = getattr(obj.modified_by, field)
# RBAC summary fields # 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 = {} roles = {}
for field in obj._meta.get_fields(): for field in obj._meta.get_fields():
if type(field) is ImplicitRoleField: if type(field) is ImplicitRoleField:
@@ -1524,7 +1521,6 @@ class ResourceAccessListElementSerializer(UserSerializer):
if 'summary_fields' not in ret: if 'summary_fields' not in ret:
ret['summary_fields'] = {} ret['summary_fields'] = {}
ret['summary_fields']['active_roles'] = get_roles_on_resource(obj, user)
def format_role_perm(role): def format_role_perm(role):
role_dict = { 'id': role.id, 'name': role.name, 'description': role.description} role_dict = { 'id': role.id, 'name': role.name, 'description': role.description}

11
awx/main/tests/functional/test_rbac_api.py
View File

@@ -416,17 +416,6 @@ def test_ensure_rbac_fields_are_present(organization, get, admin):
role = org_role_response.data role = org_role_response.data
assert role['related']['organization'] == url 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 @pytest.mark.django_db
def test_ensure_role_summary_is_present(organization, get, user): def test_ensure_role_summary_is_present(organization, get, user):
url = reverse('api:organization_detail', args=(organization.id,)) url = reverse('api:organization_detail', args=(organization.id,))