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

Added filtering to the voucher list

Browse Source
This commit is contained in:
Raphael Michel
2016-07-30 13:56:43 +02:00
parent b7ad2cdc39
commit 650f2412c2
3 changed files with 51 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/control/views/vouchers.py
View File

@@ -3,6 +3,7 @@ from django.core.urlresolvers import resolve, reverse
from django.db import transaction
from django.db.models import Q
from django.http import Http404, HttpResponseRedirect
from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _
from django.views.generic import CreateView, DeleteView, ListView, UpdateView
@@ -24,6 +25,17 @@ class VoucherList(EventPermissionRequiredMixin, ListView):
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))
if self.request.GET.get("tag", "") != "":
s = self.request.GET.get("tag", "")
qs = qs.filter(tag=s)
if self.request.GET.get("status", "") != "":
s = self.request.GET.get("status", "")
if s == 'v':
qs = qs.filter(Q(valid_until__isnull=True) | Q(valid_until__gt=now())).filter(redeemed=False)
elif s == 'r':
qs = qs.filter(redeemed=True)
elif s == 'e':
qs = qs.filter(Q(valid_until__isnull=False) & Q(valid_until__lt=now())).filter(redeemed=False)
return qs