shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 15:21:13 +03:00
Code Releases Activity

fix team tests

Browse Source
This commit is contained in:
Wayne Witzel III 2016-04-15 15:26:05 -04:00
parent d2a81f46e3
commit 6229e978e9
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/models/mixins.py
View File

@ -48,7 +48,7 @@ class ResourceMixin(models.Model):
roles = roles.filter(ancestors__in=accessor_roles)
kwargs = {'id__in':roles.values_list('object_id', flat=True)}
return cls.objects.filter(**kwargs)
return cls.objects.filter(**kwargs).distinct()
if type(accessor) == User:
kwargs = {}
@ -66,7 +66,7 @@ class ResourceMixin(models.Model):
kwargs[role_name + '__ancestors__in'] = roles
qs = cls.objects.filter(**kwargs)
return qs
return qs.distinct()
def get_permissions(self, accessor):

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

@ -94,6 +94,11 @@ class Role(CommonModelNameNotUnique):
return reverse('api:role_detail', args=(self.pk,))
def __contains__(self, user):
if user.__class__.__name__ == 'Team':
team_type = ContentType.objects.get_for_model(user)
roles = Role.objects.filter(content_type__pk=team_type.id,
object_id=user.id)
return self.ancestors.filter(pk__in=roles).exists()
return self.ancestors.filter(members=user).exists()
def rebuild_role_ancestor_list(self):

6
awx/main/tests/functional/test_rbac_team.py
View File

@ -65,9 +65,9 @@ def test_team_accessible_objects(team, user, project):
u = user('team_member', False)
team.member_role.children.add(project.member_role)
assert len(Project.accessible_objects(team, {'read':True})) == 1
assert not Project.accessible_objects(u, {'read':True})
assert len(Project.accessible_objects(team, 'read_role')) == 1
assert not Project.accessible_objects(u, 'read_role')
team.member_role.members.add(u)
assert len(Project.accessible_objects(u, {'read':True})) == 1
assert len(Project.accessible_objects(u, 'read_role')) == 1