From 068a7889580476ad057d9a250a67bd28f24612b8 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 16 Jun 2016 13:18:47 -0400 Subject: [PATCH] team_project sublist to use same pattern as project_team --- awx/api/views.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 2f1ef6cd78..07e66ceb56 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -898,10 +898,13 @@ class TeamProjectsList(SubListAPIView): def get_queryset(self): team = self.get_parent_object() self.check_parent_access(team) - team_qs = Project.objects.filter(Q(use_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 - + model_ct = ContentType.objects.get_for_model(self.model) + parent_ct = ContentType.objects.get_for_model(self.parent_model) + proj_roles = Role.objects.filter( + Q(ancestors__content_type=parent_ct) & Q(ancestors__object_id=team.pk), + content_type=model_ct + ) + return self.model.accessible_objects(self.request.user, 'read_role').filter(pk__in=[t.content_object.pk for t in proj_roles]) class TeamActivityStreamList(SubListAPIView):