From 2557a8e4ecc0962bc60b4e0b4da61b95451f98f3 Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Sat, 8 Sep 2018 20:57:43 +0200 Subject: [PATCH] Allow to show all vouchers with empty tags --- src/pretix/control/forms/filter.py | 5 ++++- .../templates/pretixcontrol/vouchers/tags.html | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/pretix/control/forms/filter.py b/src/pretix/control/forms/filter.py index 3c59ddc4ad..2684e7f96a 100644 --- a/src/pretix/control/forms/filter.py +++ b/src/pretix/control/forms/filter.py @@ -796,7 +796,10 @@ class VoucherFilterForm(FilterForm): if fdata.get('tag'): s = fdata.get('tag').strip() - qs = qs.filter(tag__icontains=s) + if s == '<>': + qs = qs.filter(Q(tag__isnull=True) | Q(tag='')) + else: + qs = qs.filter(tag__icontains=s) if fdata.get('qm'): s = fdata.get('qm') diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/tags.html b/src/pretix/control/templates/pretixcontrol/vouchers/tags.html index 198769ae2d..34537d0f41 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/tags.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/tags.html @@ -27,10 +27,17 @@ {% for t in tags %} - - {{ t.tag }} - ({{ t.redeemed }} / {{ t.total }}) + + {% if t.tag %} + + {{ t.tag }} + + {% else %} + '|urlencode }}"> + {% trans "Empty tag" %} + + {% endif %} + ({{ t.redeemed }} / {{ t.total }})