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

Merge pull request #3951 from AlanCoding/label_test_fix

Browse Source 
Environment specific label test failure fix
This commit is contained in:
Alan Rominger
2016-11-11 12:52:50 -05:00
committed by GitHub
parent 93f68ad0e2 15558aac08
commit e7d9fe0204
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/access.py
View File

@@ -1956,7 +1956,7 @@ class LabelAccess(BaseAccess):
def get_queryset(self): def get_queryset(self):
if self.user.is_superuser or self.user.is_system_auditor: if self.user.is_superuser or self.user.is_system_auditor:
return self.model.objects.all() return self.model.objects.all()
return self.model.objects.filter( return self.model.objects.all().filter(
organization__in=Organization.accessible_objects(self.user, 'read_role') organization__in=Organization.accessible_objects(self.user, 'read_role')
) )

5
awx/main/tests/functional/test_rbac_label.py
View File

@@ -6,8 +6,9 @@ from awx.main.access import (
@pytest.mark.django_db @pytest.mark.django_db
def test_label_get_queryset_user(label, user): def test_label_get_queryset_user(label, user):
access = LabelAccess(user('user', False)) u = user('user', False)
label.organization.member_role.members.add(user('user', False)) access = LabelAccess(u)
label.organization.member_role.members.add(u)
assert access.get_queryset().count() == 1 assert access.get_queryset().count() == 1
@pytest.mark.django_db @pytest.mark.django_db