From e4a1a9c3bf469ece47651e3a91355d7ee246fc6e Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Mon, 21 Mar 2016 22:09:55 -0400 Subject: [PATCH] Fixed user/:id/projects after ripping out Team.users --- awx/api/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index e754e15586..4b228aea0f 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -1047,8 +1047,9 @@ class UserProjectsList(SubListAPIView): def get_queryset(self): parent = self.get_parent_object() self.check_parent_access(parent) - qs = self.request.user.get_queryset(self.model) - return qs.filter(teams__in=parent.teams.distinct()) + my_qs = Project.accessible_objects(self.request.user, {'read': True}) + user_qs = Project.accessible_objects(parent, {'read': True}) + return my_qs & user_qs class UserCredentialsList(SubListCreateAttachDetachAPIView):