diff --git a/cookbook/helper/permission_helper.py b/cookbook/helper/permission_helper.py index b5230d0d..c0a357e7 100644 --- a/cookbook/helper/permission_helper.py +++ b/cookbook/helper/permission_helper.py @@ -79,8 +79,7 @@ def is_object_shared(user, obj): # share checks for relevant objects if not user.is_authenticated: return False - else: - return user in obj.get_shared() + return user in obj.get_shared() def share_link_valid(recipe, share): diff --git a/cookbook/serializer.py b/cookbook/serializer.py index bf89d48e..3fffdea7 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -62,7 +62,7 @@ class ExtendedRecipeMixin(serializers.ModelSerializer): # probably not a tree pass if recipes.count() != 0: - return recipes.order_by('?')[:1][0].image.url + return random.choice(recipes).image.url else: return None @@ -96,7 +96,7 @@ class CustomDecimalField(serializers.Field): class SpaceFilterSerializer(serializers.ListSerializer): def to_representation(self, data): - if (type(data) == QuerySet and data.query.is_sliced): + if (type(data) == QuerySet and data.query.is_sliced) or not self.context.get('request', None): # if query is sliced it came from api request not nested serializer return super().to_representation(data) if self.child.Meta.model == User: diff --git a/cookbook/views/api.py b/cookbook/views/api.py index 129068b5..68e3cea9 100644 --- a/cookbook/views/api.py +++ b/cookbook/views/api.py @@ -675,7 +675,6 @@ class RecipeViewSet(viewsets.ModelViewSet): return Response(self.serializer_class(qs, many=True).data) -# TODO deprecate class ShoppingListRecipeViewSet(viewsets.ModelViewSet): queryset = ShoppingListRecipe.objects serializer_class = ShoppingListRecipeSerializer diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue index d58b2159..a6fd2b12 100644 --- a/vue/src/apps/MealPlanView/MealPlanView.vue +++ b/vue/src/apps/MealPlanView/MealPlanView.vue @@ -84,12 +84,7 @@
{{ $t("Shopping_List_Empty") }}
+