cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed shopping list share permission

Browse Source
This commit is contained in:
vabene1111
2021-03-18 11:04:55 +01:00
parent cb78f75f19
commit 6a25428b3c
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/helper/permission_helper.py
View File

@ -79,7 +79,7 @@ def is_object_shared(user, obj):
# share checks for relevant objects # share checks for relevant objects
if not user.is_authenticated: if not user.is_authenticated:
return False return False
return user in obj.shared.all() return user in obj.get_shared()
def share_link_valid(recipe, share): def share_link_valid(recipe, share):

8
cookbook/models.py
View File

@ -45,6 +45,11 @@ class PermissionModelMixin:
return self.user return self.user
return None return None
def get_shared(self):
if getattr(self, 'shared', None):
return self.shared.all()
return []
def get_space(self): def get_space(self):
p = '.'.join(self.get_space_key()) p = '.'.join(self.get_space_key())
if getattr(self, p, None): if getattr(self, p, None):
@ -549,6 +554,9 @@ class ShoppingListEntry(models.Model, PermissionModelMixin):
def __str__(self): def __str__(self):
return f'Shopping list entry {self.id}' return f'Shopping list entry {self.id}'
def get_shared(self):
return self.shoppinglist_set.first().shared.all()
def get_owner(self): def get_owner(self):
try: try:
return self.shoppinglist_set.first().created_by return self.shoppinglist_set.first().created_by

8
cookbook/views/api.py
View File

@ -337,19 +337,19 @@ class RecipeViewSet(viewsets.ModelViewSet, StandardFilterMixin):
class ShoppingListRecipeViewSet(viewsets.ModelViewSet): class ShoppingListRecipeViewSet(viewsets.ModelViewSet):
queryset = ShoppingListRecipe.objects queryset = ShoppingListRecipe.objects
serializer_class = ShoppingListRecipeSerializer serializer_class = ShoppingListRecipeSerializer
permission_classes = [CustomIsOwner, ] permission_classes = [CustomIsOwner| CustomIsShared ]
def get_queryset(self): def get_queryset(self):
return self.queryset.filter(shoppinglist__created_by=self.request.user, shoppinglist__space=self.request.space).all() return self.queryset.filter(Q(shoppinglist__created_by=self.request.user) | Q(shoppinglist__shared=self.request.user)).filter(shoppinglist__space=self.request.space).all()
class ShoppingListEntryViewSet(viewsets.ModelViewSet): class ShoppingListEntryViewSet(viewsets.ModelViewSet):
queryset = ShoppingListEntry.objects queryset = ShoppingListEntry.objects
serializer_class = ShoppingListEntrySerializer serializer_class = ShoppingListEntrySerializer
permission_classes = [CustomIsOwner, ] permission_classes = [CustomIsOwner | CustomIsShared]
def get_queryset(self): def get_queryset(self):
return self.queryset.filter(shoppinglist__created_by=self.request.user, shoppinglist__space=self.request.space).all() return self.queryset.filter(Q(shoppinglist__created_by=self.request.user) | Q(shoppinglist__shared=self.request.user)).filter(shoppinglist__space=self.request.space).all()
class ShoppingListViewSet(viewsets.ModelViewSet): class ShoppingListViewSet(viewsets.ModelViewSet):