From 52944ff3a3b625a6fc02550f87b04180284a5dbf Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Mon, 7 Sep 2020 11:27:23 +0200
Subject: [PATCH] Fix obscure crash in log entry view

---
 src/pretix/control/logdisplay.py      | 2 +-
 src/pretix/control/views/organizer.py | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pretix/control/logdisplay.py b/src/pretix/control/logdisplay.py
index 50c6f0aa2d..537c93bc44 100644
--- a/src/pretix/control/logdisplay.py
+++ b/src/pretix/control/logdisplay.py
@@ -440,7 +440,7 @@ def pretixcontrol_logentry_display(sender: Event, logentry: LogEntry, **kwargs):
             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)
 
     if logentry.action_type == 'pretix.control.views.checkin':
diff --git a/src/pretix/control/views/organizer.py b/src/pretix/control/views/organizer.py
index 9e1ef23f7a..8d943824c1 100644
--- a/src/pretix/control/views/organizer.py
+++ b/src/pretix/control/views/organizer.py
@@ -751,7 +751,9 @@ class DeviceLogView(OrganizerDetailViewMixin, OrganizerPermissionRequiredMixin,
         qs = LogEntry.objects.filter(
             device_id=self.device
         ).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')
         return qs