1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-15 06:17:37 +02:00

Compare commits

..

No commits in common. "c4404ef995fa5fbdef3de508babc126e9d3914a0" and "f0e9a7d3dc615ded4fe68b38e761aa7f145b70a2" have entirely different histories.

2 changed files with 5 additions and 9 deletions

View File

@ -52,7 +52,7 @@
"model": "food.allergen",
"pk": 8,
"fields": {
"name": "Céleri"
"name": "Céléri"
}
},
{

View File

@ -8,7 +8,7 @@ from django_tables2.views import MultiTableMixin
from django.db import transaction
from django.db.models import Q
from django.http import HttpResponseRedirect
from django.views.generic import DetailView, UpdateView, CreateView
from django.views.generic import DetailView, UpdateView
from django.views.generic.list import ListView
from django.urls import reverse_lazy
from django.utils import timezone
@ -106,7 +106,7 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li
return context
class QRCodeCreateView(ProtectQuerysetMixin, CreateView):
class QRCodeCreateView(ProtectQuerysetMixin, ProtectedCreateView):
"""
A view to add qrcode
"""
@ -260,8 +260,6 @@ class AddIngredientView(ProtectQuerysetMixin, UpdateView):
@transaction.atomic
def form_valid(self, form):
meals = TransformedFood.objects.filter(pk__in=form.data.getlist('ingredients')).all()
if not meals:
return HttpResponseRedirect(reverse_lazy('food:food_view', kwargs={"pk": self.object.pk}))
for meal in meals:
old_ingredients = list(meal.ingredients.all()).copy()
old_allergens = list(meal.allergens.all()).copy()
@ -387,8 +385,7 @@ class BasicFoodDetailView(FoodDetailView):
return context
def get(self, *args, **kwargs):
if Food.objects.filter(pk=kwargs['pk']).count() == 1:
kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'basicfood')
kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'basicfood')
return super().get(*args, **kwargs)
@ -407,6 +404,5 @@ class TransformedFoodDetailView(FoodDetailView):
return context
def get(self, *args, **kwargs):
if Food.objects.filter(pk=kwargs['pk']).count() == 1:
kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
return super().get(*args, **kwargs)