Merge branch 'develop' of https://github.com/TandoorRecipes/recipes into develop

� Conflicts:
�	docs/install/manual.md

Author: MarcusWolschon

cookbook/helper/permission_helper.py

@@ -206,7 +206,7 @@ def has_permission(self, request, view):
 
     def has_object_permission(self, request, view, obj):
         # temporary hack to make old shopping list work with new shopping list
-        if obj.__class__.__name__ == 'ShoppingList':
+        if obj.__class__.__name__ in ['ShoppingList', 'ShoppingListEntry']:
             return is_object_shared(request.user, obj) or obj.created_by in list(request.user.get_shopping_share())
         return is_object_shared(request.user, obj)
 

cookbook/helper/shopping_helper.py

@@ -79,7 +79,7 @@ def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None
     elif ingredients:
         ingredients = Ingredient.objects.filter(pk__in=ingredients, space=space)
     else:
-        ingredients = Ingredient.objects.filter(step__recipe=r, space=space)
+        ingredients = Ingredient.objects.filter(step__recipe=r,  food__ignore_shopping=False, space=space)
 
         if exclude_onhand := created_by.userpreference.mealplan_autoexclude_onhand:
             ingredients = ingredients.exclude(food__onhand_users__id__in=[x.id for x in shared_users])
@@ -101,9 +101,9 @@ def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None
                 if ingredients.filter(food__recipe=x).exists():
                     for ing in ingredients.filter(food__recipe=x):
                         if exclude_onhand:
-                            x_ing = Ingredient.objects.filter(step__recipe=x,  space=space).exclude(food__onhand_users__id__in=[x.id for x in shared_users])
+                            x_ing = Ingredient.objects.filter(step__recipe=x,  food__ignore_shopping=False, space=space).exclude(food__onhand_users__id__in=[x.id for x in shared_users])
                         else:
-                            x_ing = Ingredient.objects.filter(step__recipe=x, space=space)
+                            x_ing = Ingredient.objects.filter(step__recipe=x,  food__ignore_shopping=False, space=space).exclude(food__ignore_shopping=True)
                         for i in [x for x in x_ing]:
                             ShoppingListEntry.objects.create(
                                 list_recipe=list_recipe,

cookbook/locale/de/LC_MESSAGES/django.po

@@ -15,8 +15,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-01-18 14:52+0100\n"
-"PO-Revision-Date: 2022-01-26 14:06+0000\n"
-"Last-Translator: Leni <[email protected]>\n"
+"PO-Revision-Date: 2022-01-28 00:06+0000\n"
+"Last-Translator: Alex Hanselmann <[email protected]>\n"
 "Language-Team: German <http://translate.tandoor.dev/projects/tandoor/"
 "recipes-backend/de/>\n"
 "Language: de\n"
@@ -425,27 +425,27 @@ msgstr "Separator für CSV-Export."
 
 #: .\cookbook\forms.py:504
 msgid "Prefix to add when copying list to the clipboard."
-msgstr ""
+msgstr "Zusatz wird der in die Zwischenablage kopierten Liste vorangestellt."
 
 #: .\cookbook\forms.py:508
 msgid "Share Shopping List"
 msgstr "Einkaufsliste teilen"
 
 #: .\cookbook\forms.py:509
 msgid "Autosync"
-msgstr ""
+msgstr "Automatischer Abgleich"
 
 #: .\cookbook\forms.py:510
 msgid "Auto Add Meal Plan"
-msgstr ""
+msgstr "automatisch dem Menüplan hinzufügen"
 
 #: .\cookbook\forms.py:511
 msgid "Exclude On Hand"
 msgstr ""
 
 #: .\cookbook\forms.py:512
 msgid "Include Related"
-msgstr ""
+msgstr "dazugehörend"
 
 #: .\cookbook\forms.py:513
 msgid "Default Delay Hours"
@@ -459,11 +459,11 @@ msgstr "Supermarkt filtern"
 
 #: .\cookbook\forms.py:515
 msgid "Recent Days"
-msgstr ""
+msgstr "Vergangene Tage"
 
 #: .\cookbook\forms.py:516
 msgid "CSV Delimiter"
-msgstr ""
+msgstr "CSV Trennzeichen"
 
 #: .\cookbook\forms.py:517 .\cookbook\templates\shopping_list.html:322
 msgid "List Prefix"
@@ -525,7 +525,7 @@ msgstr ""
 
 #: .\cookbook\helper\recipe_search.py:473
 msgid "One of queryset or hash_key must be provided"
-msgstr ""
+msgstr "Es muss die Abfrage oder der Hash_Key angeben werden"
 
 #: .\cookbook\helper\scrapers\cookidoo.py:21
 msgid "Linkslauf"
@@ -550,7 +550,7 @@ msgstr "Mindestens ein Rezept oder ein Essensplan müssen angegeben werden"
 
 #: .\cookbook\helper\shopping_helper.py:58
 msgid "You must supply a created_by"
-msgstr ""
+msgstr "Die Angabe der Verfassers ist notwendig"
 
 #: .\cookbook\helper\template_helper.py:61
 #: .\cookbook\helper\template_helper.py:63
@@ -743,7 +743,7 @@ msgstr "Stichwort Alias"
 
 #: .\cookbook\serializer.py:175
 msgid "A user is required"
-msgstr ""
+msgstr "Ein Benutzername ist notwendig"
 
 #: .\cookbook\serializer.py:195
 msgid "File uploads are not enabled for this Space."

cookbook/serializer.py

@@ -33,7 +33,7 @@ class ExtendedRecipeMixin(serializers.ModelSerializer):
     images = None
 
     image = serializers.SerializerMethodField('get_image')
-    numrecipe = serializers.ReadOnlyField(source='count_recipes_test')
+    numrecipe = serializers.ReadOnlyField(source='recipe_count')
 
     def get_fields(self, *args, **kwargs):
         fields = super().get_fields(*args, **kwargs)
@@ -58,9 +58,6 @@ def get_image(self, obj):
         if obj.recipe_image:
             return MEDIA_URL + obj.recipe_image
 
-    def count_recipes(self, obj):
-        return Recipe.objects.filter(**{self.recipe_filter: obj}, space=obj.space).count()
-
 
 class CustomDecimalField(serializers.Field):
     """
@@ -169,6 +166,11 @@ class UserPreferenceSerializer(WritableNestedModelSerializer):
     food_inherit_default = FoodInheritFieldSerializer(source='space.food_inherit', many=True, allow_null=True, required=False, read_only=True)
     plan_share = UserNameSerializer(many=True, allow_null=True, required=False, read_only=True)
     shopping_share = UserNameSerializer(many=True, allow_null=True, required=False)
+    food_children_exist = serializers.SerializerMethodField('get_food_children_exist')
+
+    def get_food_children_exist(self, obj):
+        space = getattr(self.context.get('request', None), 'space', None)
+        return Food.objects.filter(depth__gt=0, space=space).exists()
 
     def create(self, validated_data):
         if not validated_data.get('user', None):
@@ -183,7 +185,7 @@ class Meta:
             'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_fractions', 'use_kj', 'search_style', 'show_recent', 'plan_share',
             'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'food_inherit_default', 'default_delay',
             'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days', 'csv_delim', 'csv_prefix',
-            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed'
+            'filter_to_supermarket', 'shopping_add_onhand', 'left_handed', 'food_children_exist'
         )
 
 
@@ -429,7 +431,7 @@ class Meta:
         model = Food
         fields = (
             'id', 'name', 'description', 'shopping', 'recipe', 'food_onhand', 'supermarket_category',
-            'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name'
+            'image', 'parent', 'numchild', 'numrecipe', 'inherit_fields', 'full_name', 'ignore_shopping'
         )
         read_only_fields = ('id', 'numchild', 'parent', 'image', 'numrecipe')
 
@@ -683,14 +685,15 @@ def get_name(self, obj):
             value = Decimal(value)
         value = value.quantize(Decimal(1)) if value == value.to_integral() else value.normalize()  # strips trailing zero
         return (
-                       obj.name
-                       or getattr(obj.mealplan, 'title', None)
-                       or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
-                       or obj.recipe.name
-               ) + f' ({value:.2g})'
+            obj.name
+            or getattr(obj.mealplan, 'title', None)
+            or (d := getattr(obj.mealplan, 'date', None)) and ': '.join([obj.mealplan.recipe.name, str(d)])
+            or obj.recipe.name
+        ) + f' ({value:.2g})'
 
     def update(self, instance, validated_data):
-        if 'servings' in validated_data:
+        # TODO remove once old shopping list
+        if 'servings' in validated_data and self.context.get('view', None).__class__.__name__ != 'ShoppingListViewSet':
             list_from_recipe(
                 list_recipe=instance,
                 servings=validated_data['servings'],

cookbook/signals.py

@@ -121,11 +121,3 @@ def auto_add_shopping(sender, instance=None, created=False, weak=False, **kwargs
             'servings': instance.servings
         }
         list_recipe = list_from_recipe(**kwargs)
-
-
-# user = self.context['request'].user
-#       if user.userpreference.shopping_add_onhand:
-#            if checked := validated_data.get('checked', None):
-#                 instance.food.onhand_users.add(*user.userpreference.shopping_share.all(), user)
-#             elif checked == False:
-#                 instance.food.onhand_users.remove(*user.userpreference.shopping_share.all(), user)

cookbook/templates/shopping_list.html

@@ -834,7 +834,7 @@ <h2>{% trans 'Shopping List' %}</h2>
                 this.$http.get('{% url 'api:recipe-detail' 123456 %}'.replace('123456', recipe.id)).then((response) => {
                     for (let s of response.data.steps) {
                         for (let i of s.ingredients) {
-                            if (!i.is_header && i.food !== null && i.food.food_onhand === false) {
+                            if (!i.is_header && i.food !== null && !i.food.ignore_food) {
                                 this.shopping_list.entries.push({
                                     'list_recipe': slr.id,
                                     'food': i.food,

cookbook/views/api.py

@@ -118,7 +118,7 @@ def annotate_recipe(self, queryset=None, request=None, serializer=None, tree=Fal
             # add a recipe count annotation to the query
             #  explanation on construction https://stackoverflow.com/a/43771738/15762829
             recipe_count = Recipe.objects.filter(**{recipe_filter: OuterRef('id')}, space=space).values(recipe_filter).annotate(count=Count('pk')).values('count')
-            queryset = queryset.annotate(recipe_count_test=Coalesce(Subquery(recipe_count), 0))
+            queryset = queryset.annotate(recipe_count=Coalesce(Subquery(recipe_count), 0))
 
             # add a recipe image annotation to the query
             image_subquery = Recipe.objects.filter(**{recipe_filter: OuterRef('id')}, space=space).exclude(image__isnull=True).exclude(image__exact='').order_by("?").values('image')[:1]
@@ -400,7 +400,7 @@ class SupermarketCategoryViewSet(viewsets.ModelViewSet, StandardFilterMixin):
     permission_classes = [CustomIsUser]
 
     def get_queryset(self):
-        self.queryset = self.queryset.filter(space=self.request.space)
+        self.queryset = self.queryset.filter(space=self.request.space).order_by('name')
         return super().get_queryset()