From 033c466cf7ba6853645927f67a60380fd57b89d6 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 7 Nov 2025 15:49:14 +0100 Subject: [PATCH] Fix some bugs --- apps/food/api/serializers.py | 2 +- apps/food/models.py | 1 + apps/food/views.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/food/api/serializers.py b/apps/food/api/serializers.py index 1400a28a..4b3a2f11 100644 --- a/apps/food/api/serializers.py +++ b/apps/food/api/serializers.py @@ -27,7 +27,7 @@ class FoodSerializer(serializers.ModelSerializer): class Meta: model = Food - fields = ['name', 'owner', 'allergens', 'expiry_date', 'end_of_life', 'is_ready', 'order', 'owner_name'] + fields = ['id', 'name', 'owner', 'allergens', 'expiry_date', 'end_of_life', 'is_ready', 'order', 'owner_name'] class BasicFoodSerializer(serializers.ModelSerializer): diff --git a/apps/food/models.py b/apps/food/models.py index 6a044a89..e1a3caed 100644 --- a/apps/food/models.py +++ b/apps/food/models.py @@ -486,6 +486,7 @@ class Order(models.Model): destination=self.activity.organizer.note, amount=self.amount, quantity=1, + reason=str(self.dish), ) transaction.save() else: diff --git a/apps/food/views.py b/apps/food/views.py index af2b262f..f33d6cf6 100644 --- a/apps/food/views.py +++ b/apps/food/views.py @@ -308,7 +308,7 @@ class ManageIngredientsView(LoginRequiredMixin, UpdateView): prefix = 'form-' + str(i) + '-' ingredient = None - if form.data[prefix + 'qrcode'] not in ['0', '']: + if form.data[prefix + 'qrcode'] not in ['0', '', 'NaN']: ingredient = QRCode.objects.get(pk=form.data[prefix + 'qrcode']).food_container elif form.data[prefix + 'name'] != '': @@ -1067,6 +1067,7 @@ def get_ingredients_for_recipe(request): query |= Q(name__istartswith=name) qs = Food.objects.filter(query).distinct() + qs = qs.filter(PermissionBackend.filter_queryset(request, Food, 'view')) data = [{'id': f.id, 'name': f.name, 'qr_code_numbers': ", ".join(str(q.qr_code_number) for q in f.QR_code.all())} for f in qs] return JsonResponse({'ingredients': data})