From 5e7b6ed0847154a99f790766bbd7ccf4295118a3 Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Fri, 15 Apr 2016 16:29:22 -0400 Subject: [PATCH] fixes for api/test_credential.py --- awx/api/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index f4d7d4b3d3..fdde047b33 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -831,8 +831,8 @@ class TeamProjectsList(SubListAPIView): def get_queryset(self): team = self.get_parent_object() self.check_parent_access(team) - team_qs = Project.objects.filter(Q(member_role__parents=team.member_role) | Q(admin_role__parents=team.member_role)) - user_qs = Project.accessible_objects(self.request.user, 'read_role') + team_qs = Project.objects.filter(Q(member_role__parents=team.member_role) | Q(admin_role__parents=team.member_role)).distinct() + user_qs = Project.accessible_objects(self.request.user, 'read_role').distinct() return team_qs & user_qs @@ -1217,7 +1217,7 @@ class CredentialList(ListCreateAPIView): organization = Organization.objects.get(pk=request.data['organization']) obj = organization - if self.request.user not in obj.owner_role: + if self.request.user not in obj.admin_role: raise PermissionDenied() ret = super(CredentialList, self).post(request, *args, **kwargs) @@ -1263,7 +1263,7 @@ class TeamCredentialsList(CredentialList): raise PermissionDenied() visible_creds = Credential.accessible_objects(self.request.user, 'read_role') - team_creds = Credential.objects.filter(owner_role__parents=team.member_role) + team_creds = Credential.objects.filter(owner_role__parents=team.member_role).distinct() return team_creds & visible_creds def post(self, request, *args, **kwargs):