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

Fix Checkin logdisplay for deleted events (#4821)

Browse Source
This commit is contained in:
Mira
2025-02-07 14:25:57 +01:00
committed by GitHub
parent f7cba6a2bd
commit 9c781a174d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/control/logdisplay.py
View File

@@ -337,7 +337,7 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
event = logentry.event event = logentry.event
if 'list' in data: if 'list' in data and event:
try: try:
data['list'] = event.checkin_lists.get(pk=data.get('list')).name data['list'] = event.checkin_lists.get(pk=data.get('list')).name
except CheckinList.DoesNotExist: except CheckinList.DoesNotExist:
@@ -351,8 +351,8 @@ class CheckinErrorLogEntryType(OrderLogEntryType):
if 'datetime' in data: if 'datetime' in data:
dt = dateutil.parser.parse(data.get('datetime')) dt = dateutil.parser.parse(data.get('datetime'))
if abs((logentry.datetime - dt).total_seconds()) > 5 or data.get('forced'): if abs((logentry.datetime - dt).total_seconds()) > 5 or data.get('forced'):
tz = event.timezone if event:
data['datetime'] = date_format(dt.astimezone(tz), "SHORT_DATETIME_FORMAT") data['datetime'] = date_format(dt.astimezone(event.timezone), "SHORT_DATETIME_FORMAT")
return str(plain_with_dt).format_map(data) return str(plain_with_dt).format_map(data)
return str(plain_without_dt).format_map(data) return str(plain_without_dt).format_map(data)
@@ -417,7 +417,7 @@ class OrderPrintLogEntryType(OrderLogEntryType):
datetime=date_format( datetime=date_format(
dateutil.parser.parse(data["datetime"]).astimezone(logentry.event.timezone), dateutil.parser.parse(data["datetime"]).astimezone(logentry.event.timezone),
"SHORT_DATETIME_FORMAT" "SHORT_DATETIME_FORMAT"
), ) if logentry.event else data["datetime"],
type=dict(PrintLog.PRINT_TYPES)[data["type"]], type=dict(PrintLog.PRINT_TYPES)[data["type"]],
) )