External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-21 14:38:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3776 from wwitzel3/release_3.0.3

Browse Source 
Revert "filter internal User.admin_roles from the /roles API list view"
This commit is contained in:
Wayne Witzel III 2016-10-27 14:16:13 -04:00 committed by GitHub
commit c5a9439198
2 changed files with 2 additions and 5 deletions
Show Stats 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]
)
# 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)
return qs
@staticmethod
@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 organization.admin_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 inventory.admin_role.id not in role_hash