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

Change filtering priority to prevent building a queryset with null

Browse Source 
values when examining project activity stream
This commit is contained in:
Matthew Jones
2014-10-07 16:49:27 -04:00
parent ea36e30190
commit 6e24131070
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/views.py
View File

@@ -621,6 +621,10 @@ class ProjectActivityStreamList(SubListAPIView):
parent = self.get_parent_object() parent = self.get_parent_object()
self.check_parent_access(parent) self.check_parent_access(parent)
qs = self.request.user.get_queryset(self.model) qs = self.request.user.get_queryset(self.model)
if parent is None:
return qs
elif parent.credential is None:
return qs.filter(project=parent)
return qs.filter(Q(project=parent) | Q(credential__in=parent.credential)) return qs.filter(Q(project=parent) | Q(credential__in=parent.credential))