Merge pull request #2830 from AlanCoding/2828_proj_AS

M2M fix for project activity stream
This commit is contained in:
Alan Rominger 2016-07-07 10:56:41 -04:00 committed by GitHub
commit 4fce29fe1d

View File

@ -1040,7 +1040,7 @@ class ProjectActivityStreamList(SubListAPIView):
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=parent.credential))
class ProjectNotificationTemplatesAnyList(SubListCreateAttachDetachAPIView):