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

Ticket PDF exporter: Fix call to None.timezone

Browse Source
This commit is contained in:
Raphael Michel
2021-04-20 18:31:39 +02:00
parent 97dbef9778
commit b482d84c3c
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/base/exporter.py
View File

@@ -72,8 +72,10 @@ class BaseExporter:
if isinstance(event, QuerySet): if isinstance(event, QuerySet):
self.events = event self.events = event
self.event = None self.event = None
self.timezone = self.events.first().timezone
else: else:
self.events = Event.objects.filter(pk=event.pk) self.events = Event.objects.filter(pk=event.pk)
self.timezone = event.timezone
def __str__(self): def __str__(self):
return self.identifier return self.identifier

4
src/pretix/plugins/ticketoutputpdf/exporters.py
View File

@@ -122,14 +122,14 @@ class AllTicketsPDF(BaseExporter):
dt = make_aware(datetime.combine( dt = make_aware(datetime.combine(
dateutil.parser.parse(form_data['date_from']).date(), dateutil.parser.parse(form_data['date_from']).date(),
time(hour=0, minute=0, second=0) time(hour=0, minute=0, second=0)
), self.event.timezone) ), self.timezone)
qs = qs.filter(Q(subevent__date_from__gte=dt) | Q(subevent__isnull=True, order__event__date_from__gte=dt)) qs = qs.filter(Q(subevent__date_from__gte=dt) | Q(subevent__isnull=True, order__event__date_from__gte=dt))
if form_data.get('date_to'): if form_data.get('date_to'):
dt = make_aware(datetime.combine( dt = make_aware(datetime.combine(
dateutil.parser.parse(form_data['date_to']).date() + timedelta(days=1), dateutil.parser.parse(form_data['date_to']).date() + timedelta(days=1),
time(hour=0, minute=0, second=0) time(hour=0, minute=0, second=0)
), self.event.timezone) ), self.timezone)
qs = qs.filter(Q(subevent__date_from__lt=dt) | Q(subevent__isnull=True, order__event__date_from__lt=dt)) qs = qs.filter(Q(subevent__date_from__lt=dt) | Q(subevent__isnull=True, order__event__date_from__lt=dt))
if form_data.get('order_by') == 'name': if form_data.get('order_by') == 'name':