1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-08 15:59:50 +01:00

Fix some bugs

This commit is contained in:
Ehouarn
2025-11-07 15:49:14 +01:00
parent 6a77cfd4dd
commit 033c466cf7
3 changed files with 4 additions and 2 deletions

View File

@@ -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):

View File

@@ -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:

View File

@@ -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})