External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 21:37:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2458 from AlanCoding/2453_proj_team_sub

Browse Source 
/teams/N/projects/ queryset changed to reverse of /projects/N/teams/
This commit is contained in:
Alan Rominger
2016-06-16 16:06:18 -04:00
committed by GitHub
parent c6680c5f7e 068a788958
commit d9f62c4fa9
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/views.py
View File

@@ -898,10 +898,13 @@ class TeamProjectsList(SubListAPIView):
def get_queryset(self): def get_queryset(self):
team = self.get_parent_object() team = self.get_parent_object()
self.check_parent_access(team) 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() model_ct = ContentType.objects.get_for_model(self.model)
user_qs = Project.accessible_objects(self.request.user, 'read_role').distinct() parent_ct = ContentType.objects.get_for_model(self.parent_model)
return team_qs & user_qs 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): class TeamActivityStreamList(SubListAPIView):