rebase and fixes

This commit is contained in:
smilerz
2021-12-15 09:39:20 -06:00
parent e7e3a3083d
commit 8b28a47297
14 changed files with 46 additions and 14812 deletions

View File

@ -747,12 +747,13 @@ class ShoppingListViewSet(viewsets.ModelViewSet):
serializer_class = ShoppingListSerializer
permission_classes = [CustomIsOwner | CustomIsShared]
# TODO update to include settings shared user - make both work for a period of time
def get_queryset(self):
return self.queryset.filter(Q(created_by=self.request.user) | Q(shared=self.request.user)).filter(
space=self.request.space).distinct()
return self.queryset.filter(
Q(created_by=self.request.user)
| Q(shared=self.request.user)
| Q(created_by__in=list(self.request.user.get_shopping_share()))
).filter(space=self.request.space).distinct()
# TODO deprecate
def get_serializer_class(self):
try:
autosync = self.request.query_params.get('autosync', False)