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

Revert "filter internal User.admin_roles from the /roles API list view"

Browse Source 
This reverts commit 2a55bfa5741e91c466570e7b4cf9b517d366c610.
This commit is contained in:
Wayne Witzel III
2016-10-25 13:40:15 -04:00
parent ed8bbc2bbd
commit b11f5c3015
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/rbac.py
View File

@@ -389,11 +389,7 @@ class Role(models.Model):
) )
''' % sql_params] ''' % sql_params]
) )
return qs
# Do not show roles that are of content_type(User)
# these roles are for internal only user.
user_type = ContentType.objects.get_for_model(User)
return qs.exclude(content_type__pk=user_type.id)
@staticmethod @staticmethod
@check_singleton @check_singleton

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

@@ -51,6 +51,7 @@ def test_get_roles_list_user(organization, inventory, team, get, user):
assert Role.singleton(ROLE_SINGLETON_SYSTEM_ADMINISTRATOR).id in role_hash assert Role.singleton(ROLE_SINGLETON_SYSTEM_ADMINISTRATOR).id in role_hash
assert organization.admin_role.id in role_hash assert organization.admin_role.id in role_hash
assert organization.member_role.id in role_hash assert organization.member_role.id in role_hash
assert this_user.admin_role.id in role_hash
assert custom_role.id in role_hash assert custom_role.id in role_hash
assert inventory.admin_role.id not in role_hash assert inventory.admin_role.id not in role_hash