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

Fix incorrect timezones on event dashboard

Browse Source
This commit is contained in:
Raphael Michel
2017-09-25 10:25:22 +02:00
parent 9b3ea3656f
commit 0e0534c273
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/views/dashboards.py
View File

@@ -333,8 +333,8 @@ def user_event_widgets(**kwargs):
).select_related('organizer')[:100] ).select_related('organizer')[:100]
for event in events: for event in events:
dr = event.get_date_range_display() dr = event.get_date_range_display()
tz = pytz.timezone(event.settings.timezone)
if event.has_subevents: if event.has_subevents:
tz = pytz.timezone(event.settings.timezone)
dr = daterange( dr = daterange(
(event.min_from).astimezone(tz), (event.min_from).astimezone(tz),
(event.max_fromto or event.max_to or event.max_from).astimezone(tz) (event.max_fromto or event.max_to or event.max_from).astimezone(tz)
@@ -355,9 +355,9 @@ def user_event_widgets(**kwargs):
'content': tpl.format( 'content': tpl.format(
event=escape(event.name), event=escape(event.name),
times=_('Event series') if event.has_subevents else ( times=_('Event series') if event.has_subevents else (
((date_format(event.date_admission, 'TIME_FORMAT') + ' / ') ((date_format(event.date_admission.astimezone(tz), 'TIME_FORMAT') + ' / ')
if event.date_admission and event.date_admission != event.date_from else '') if event.date_admission and event.date_admission != event.date_from else '')
+ (date_format(event.date_from, 'TIME_FORMAT') if event.date_from else '') + (date_format(event.date_from.astimezone(tz), 'TIME_FORMAT') if event.date_from else '')
), ),
url=reverse('control:event.index', kwargs={ url=reverse('control:event.index', kwargs={
'event': event.slug, 'event': event.slug,