From f690d74be7a6a556c9fb25f7fdfc180435df370a Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 3 Jul 2020 17:46:41 +0200 Subject: [PATCH] Event list: Respect event date in "running" filter --- src/pretix/control/forms/filter.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py index 144409fd3..b3cb7b928 100644 --- a/src/pretix/control/forms/filter.py +++ b/src/pretix/control/forms/filter.py @@ -723,10 +723,12 @@ class EventFilterForm(FilterForm): elif fdata.get('status') == 'running': qs = qs.filter( live=True + ).annotate( + p_end=Coalesce(F('presale_end'), F('date_to'), F('date_from')) ).filter( Q(presale_start__isnull=True) | Q(presale_start__lte=now()) ).filter( - Q(presale_end__isnull=True) | Q(presale_end__gte=now()) + Q(p_end__gte=now()) ) elif fdata.get('status') == 'notlive': qs = qs.filter(live=False)