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

Fix obscure crash in log entry view

Browse Source
This commit is contained in:
Raphael Michel
2020-09-07 11:27:23 +02:00
parent 23a9018988
commit 52944ff3a3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,7 +440,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
bleach.clean(logentry.parsed_data.get('msg'), tags=[], strip=True) bleach.clean(logentry.parsed_data.get('msg'), tags=[], strip=True)
) )
if logentry.action_type.startswith('pretix.event.checkin'): if sender and logentry.action_type.startswith('pretix.event.checkin'):
return _display_checkin(sender, logentry) return _display_checkin(sender, logentry)
if logentry.action_type == 'pretix.control.views.checkin': if logentry.action_type == 'pretix.control.views.checkin':

4
src/pretix/control/views/organizer.py
View File

@@ -751,7 +751,9 @@ class DeviceLogView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
qs = LogEntry.objects.filter( qs = LogEntry.objects.filter(
device_id=self.device device_id=self.device
).select_related( ).select_related(
'user', 'content_type', 'api_token', 'oauth_application', 'device', 'event' 'user', 'content_type', 'api_token', 'oauth_application',
).prefetch_related(
'device', 'event'
).order_by('-datetime') ).order_by('-datetime')
return qs return qs