From 1a24a2e892c39de877d851eaabbea842f007783d Mon Sep 17 00:00:00 2001 From: Tobias Kunze Date: Mon, 29 Aug 2016 19:12:05 +0200 Subject: [PATCH] Show a voucher's item's variation, if any, in list view (#181) (#213) --- src/pretix/control/templates/pretixcontrol/vouchers/index.html | 3 +++ src/pretix/control/views/vouchers.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pretix/control/templates/pretixcontrol/vouchers/index.html b/src/pretix/control/templates/pretixcontrol/vouchers/index.html index 1739ec1fb0..54b19cf8c2 100644 --- a/src/pretix/control/templates/pretixcontrol/vouchers/index.html +++ b/src/pretix/control/templates/pretixcontrol/vouchers/index.html @@ -76,6 +76,9 @@ {% if v.item %} {{ v.item }} + {% if v.variation %} + – {{ v.variation }} + {% endif %} {% else %} {% blocktrans trimmed with quota=v.quota.name %} Any product in quota "{{ quota }}" diff --git a/src/pretix/control/views/vouchers.py b/src/pretix/control/views/vouchers.py index f0a18fedc8..77ba4c5af3 100644 --- a/src/pretix/control/views/vouchers.py +++ b/src/pretix/control/views/vouchers.py @@ -28,7 +28,7 @@ class VoucherList(EventPermissionRequiredMixin, ListView): permission = 'can_change_vouchers' def get_queryset(self): - qs = self.request.event.vouchers.all().select_related('item') + qs = self.request.event.vouchers.all().select_related('item', 'variation') if self.request.GET.get("search", "") != "": s = self.request.GET.get("search", "") qs = qs.filter(Q(code__icontains=s) | Q(tag__icontains=s) | Q(comment__icontains=s))