From 4f6b1d5b6c2d041793eeaaa9425aafdd6ad7b20a Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Sun, 28 Sep 2025 21:51:54 +0200 Subject: [PATCH] More open food --- apps/food/views.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/food/views.py b/apps/food/views.py index 4af4020b..2ee8c998 100644 --- a/apps/food/views.py +++ b/apps/food/views.py @@ -74,11 +74,15 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view')) # table open - open_table = self.get_queryset().order_by('expiry_date').filter( + open_table = self.get_queryset().filter( Q(polymorphic_ctype__model='transformedfood') | Q(polymorphic_ctype__model='basicfood', basicfood__date_type='DLC')).filter( expiry_date__lt=timezone.now(), end_of_life='').filter( PermissionBackend.filter_queryset(self.request, Food, 'view')) + open_table = open_table.union(self.get_queryset().filter( + Q(end_of_life='', order__iexact='open') + ).filter( + PermissionBackend.filter_queryset(self.request, Food, 'view'))).order_by('expiry_date') # table served served_table = self.get_queryset().order_by('-pk').filter( end_of_life='', is_ready=True).exclude(