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

Allow to filter event log by device

Browse Source
This commit is contained in:
Raphael Michel
2020-09-03 14:30:21 +02:00
parent fae35cc56f
commit 5f86fbc21d
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/control/templates/pretixcontrol/event/logs.html
View File

@@ -24,6 +24,14 @@
</option> </option>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% for d in devicelist %}
{% if d.device__id %}
<option value="d-{{ d.device__id }}"
{% if "d-" in request.GET.user and request.GET.user|slice:"2:" == d.device__id|slugify %}selected="selected"{% endif %}>
{{ d.device__name }}
</option>
{% endif %}
{% endfor %}
</select> </select>
<button class="btn btn-primary" type="submit">{% trans "Filter" %}</button> <button class="btn btn-primary" type="submit">{% trans "Filter" %}</button>
</p> </p>

3
src/pretix/control/views/event.py
View File

@@ -975,6 +975,8 @@ class EventLog(EventPermissionRequiredMixin, ListView):
qs = qs.filter(user__isnull=False) qs = qs.filter(user__isnull=False)
elif self.request.GET.get('user') == 'no': elif self.request.GET.get('user') == 'no':
qs = qs.filter(user__isnull=True) 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'): elif self.request.GET.get('user'):
qs = qs.filter(user_id=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): def get_context_data(self, **kwargs):
ctx = super().get_context_data() ctx = super().get_context_data()
ctx['userlist'] = self.request.event.logentry_set.order_by().distinct().values('user__id', 'user__email') 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 return ctx