CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-09 15:54:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Event list filters: Deal with events without presale start/end

Browse Source
This commit is contained in:
Raphael Michel
2020-02-05 10:28:52 +01:00
parent c8e6daa7a1
commit 6e531ee067
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,14 +440,25 @@ class SubEventFilterForm(FilterForm):
).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(Q(presale_end__isnull=True) & Q(
Q(date_to__gte=now()) |
Q(date_to__isnull=True, date_from__gte=now())
)) |
Q(presale_end__gte=now())
) )
elif fdata.get('status') == 'inactive': elif fdata.get('status') == 'inactive':
qs = qs.filter(active=False) qs = qs.filter(active=False)
elif fdata.get('status') == 'future': elif fdata.get('status') == 'future':
qs = qs.filter(presale_start__gte=now()) qs = qs.filter(presale_start__gte=now())
elif fdata.get('status') == 'past': elif fdata.get('status') == 'past':
qs = qs.filter(presale_end__lte=now()) qs = qs.filter(
Q(presale_end__lte=now()) | Q(
Q(presale_end__isnull=True) & Q(
Q(date_to__lte=now()) |
Q(date_to__isnull=True, date_from__gte=now())
)
)
)
if fdata.get('weekday'): if fdata.get('weekday'):
qs = qs.annotate(wday=ExtractWeekDay('date_from')).filter(wday=fdata.get('weekday')) qs = qs.annotate(wday=ExtractWeekDay('date_from')).filter(wday=fdata.get('weekday'))