steffo/sophon
steffo/sophon
1
Fork 0
mirror of https://github.com/Steffo99/sophon.git synced 2024-12-22 23:04:21 +00:00
Code Activity

🐛 Fix private projects not being returned for the group owner

Browse source
This commit is contained in:
Steffo 2021-10-14 03:27:15 +02:00
parent 67d7b9a112
commit 015de8a40f
Signed by: steffo
GPG key ID: 6965406171929D01
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
backend/sophon/projects/views.py
View file

@ -4,7 +4,6 @@ from django.db.models import Q
from sophon.core.models import ResearchGroup from sophon.core.models import ResearchGroup
from sophon.core.views import SophonGroupViewSet from sophon.core.views import SophonGroupViewSet
from . import models from . import models
@ -23,9 +22,10 @@ class ResearchProjectsByGroupViewSet(ResearchProjectViewSet):
else: else:
return models.ResearchProject.objects.filter( return models.ResearchProject.objects.filter(
Q(group__slug=self.kwargs["group_slug"]) & ( Q(group__slug=self.kwargs["group_slug"]) & (
Q(visibility="PUBLIC") | Q(visibility="PUBLIC") |
Q(visibility="INTERNAL") | Q(visibility="INTERNAL") |
Q(visibility="PRIVATE", group__members__in=[self.request.user]) Q(visibility="PRIVATE", group__members__in=[self.request.user]) |
Q(visibility="PRIVATE", group__owner=self.request.user)
) )
) )
@ -40,5 +40,6 @@ class ResearchProjectsBySlugViewSet(ResearchProjectViewSet):
return models.ResearchProject.objects.filter( return models.ResearchProject.objects.filter(
Q(visibility="PUBLIC") | Q(visibility="PUBLIC") |
Q(visibility="INTERNAL") | Q(visibility="INTERNAL") |
Q(visibility="PRIVATE", group__members__in=[self.request.user]) Q(visibility="PRIVATE", group__members__in=[self.request.user]) |
Q(visibility="PRIVATE", group__owner=self.request.user)
) )