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

Fix #878 -- Add multi-event widget

Browse Source
This commit is contained in:
Raphael Michel
2019-03-19 12:16:09 +01:00
parent ca7d55082b
commit 49e706a580
13 changed files with 1096 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/base/models/event.py
View File

@@ -1,7 +1,7 @@
import string
import uuid
from collections import OrderedDict
from datetime import datetime, time
from datetime import datetime, time, timedelta
from operator import attrgetter
import pytz
@@ -668,8 +668,8 @@ class Event(EventMixin, LoggedModel):
}[ordering]
subevs = queryset.filter(
Q(active=True) & (
Q(Q(date_to__isnull=True) & Q(date_from__gte=now()))
| Q(date_to__gte=now())
Q(Q(date_to__isnull=True) & Q(date_from__gte=now() - timedelta(hours=24)))
| Q(date_to__gte=now() - timedelta(hours=24))
)
) # order_by doesn't make sense with I18nField
for f in reversed(orderfields):