From 5f86fbc21d0b56cdb5e53012a8ee2b9b55335860 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Thu, 3 Sep 2020 14:30:21 +0200 Subject: [PATCH] Allow to filter event log by device --- .../control/templates/pretixcontrol/event/logs.html | 8 ++++++++ src/pretix/control/views/event.py | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/pretix/control/templates/pretixcontrol/event/logs.html b/src/pretix/control/templates/pretixcontrol/event/logs.html index 05971d1f6e..46a62287e9 100644 --- a/src/pretix/control/templates/pretixcontrol/event/logs.html +++ b/src/pretix/control/templates/pretixcontrol/event/logs.html @@ -24,6 +24,14 @@ {% endif %} {% endfor %} + {% for d in devicelist %} + {% if d.device__id %} + + {% endif %} + {% endfor %}

diff --git a/src/pretix/control/views/event.py b/src/pretix/control/views/event.py index 514facabe8..cc3b3e82f0 100644 --- a/src/pretix/control/views/event.py +++ b/src/pretix/control/views/event.py @@ -975,6 +975,8 @@ class EventLog(EventPermissionRequiredMixin, ListView): qs = qs.filter(user__isnull=False) elif self.request.GET.get('user') == 'no': qs = qs.filter(user__isnull=True) + elif self.request.GET.get('user', '').startswith('d-'): + qs = qs.filter(device_id=self.request.GET.get('user')[2:]) elif self.request.GET.get('user'): qs = qs.filter(user_id=self.request.GET.get('user')) @@ -989,6 +991,7 @@ class EventLog(EventPermissionRequiredMixin, ListView): def get_context_data(self, **kwargs): ctx = super().get_context_data() ctx['userlist'] = self.request.event.logentry_set.order_by().distinct().values('user__id', 'user__email') + ctx['devicelist'] = self.request.event.logentry_set.order_by('device__name').distinct().values('device__id', 'device__name') return ctx