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

Merge pull request #3172 from AlanCoding/3118_role_read

Browse Source 
Drop in visible_roles to RoleAccess can_read
This commit is contained in:
Alan Rominger 2016-08-01 15:40:21 -04:00 committed by GitHub
commit 1352fe822d
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/views.py
View File

@ -3631,7 +3631,6 @@ class RoleDetail(RetrieveAPIView):
model = Role
serializer_class = RoleSerializer
permission_classes = (IsAuthenticated,)
new_in_300 = True

10
awx/main/access.py
View File

@ -1671,14 +1671,8 @@ class RoleAccess(BaseAccess):
if self.user.is_superuser or self.user.is_system_auditor:
return True
if obj.object_id:
sister_roles = Role.objects.filter(
content_type = obj.content_type,
object_id = obj.object_id
)
else:
sister_roles = obj
return self.user.roles.filter(descendents__in=sister_roles).exists()
return Role.filter_visible_roles(
self.user, Role.objects.filter(pk=obj.id)).exists()
def can_add(self, obj, data):
# Unsupported for now