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

Merge pull request #3710 from wwitzel3/release_3.0.3

Browse Source 
filter internal User.admin_roles from the /roles API list view
This commit is contained in:
Matthew Jones 2016-10-20 13:45:25 -04:00 committed by GitHub
commit e77b9b877a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -389,7 +389,11 @@ class Role(models.Model):
)
''' % 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
@check_singleton

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

@ -51,7 +51,6 @@ 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