CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Event list: Respect event date in "running" filter

Browse Source
This commit is contained in:
Raphael Michel
2020-07-03 17:46:41 +02:00
parent c52fdc95a7
commit f690d74be7
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/control/forms/filter.py
View File

@@ -723,10 +723,12 @@ class EventFilterForm(FilterForm):
elif fdata.get('status') == 'running': elif fdata.get('status') == 'running':
qs = qs.filter( qs = qs.filter(
live=True live=True
).annotate(
p_end=Coalesce(F('presale_end'), F('date_to'), F('date_from'))
).filter( ).filter(
Q(presale_start__isnull=True) | Q(presale_start__lte=now()) Q(presale_start__isnull=True) | Q(presale_start__lte=now())
).filter( ).filter(
Q(presale_end__isnull=True) | Q(presale_end__gte=now()) Q(p_end__gte=now())
) )
elif fdata.get('status') == 'notlive': elif fdata.get('status') == 'notlive':
qs = qs.filter(live=False) qs = qs.filter(live=False)