CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-13 16:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Raphael Michel
2026-04-17 02:22:49 +02:00
parent adf167e611
commit 1da1393a86
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/control/forms/vouchers.py
View File

@@ -128,8 +128,9 @@ class VoucherForm(I18nModelForm):
del self.fields['subevent'] del self.fields['subevent']
choices = [] choices = []
if 'itemvar' in initial or (self.data and 'itemvar' in self.data): prefix = (self.prefix + '-') if self.prefix else ''
iv = self.data.get('itemvar') or initial.get('itemvar', '') if 'itemvar' in initial or (self.data and prefix + 'itemvar' in self.data):
iv = self.data.get(prefix + 'itemvar') or initial.get('itemvar', '')
if iv.startswith('q-'): if iv.startswith('q-'):
q = self.event.quotas.get(pk=iv[2:]) q = self.event.quotas.get(pk=iv[2:])
choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q))) choices.append(('q-%d' % q.pk, _('Any product in quota "{quota}"').format(quota=q)))
@@ -289,7 +290,7 @@ class VoucherBulkEditForm(VoucherForm):
if self.prefix + "itemvar" in self.data.getlist('_bulk'): if self.prefix + "itemvar" in self.data.getlist('_bulk'):
try: try:
itemid = quotaid = None itemid = quotaid = None
iv = self.data.get('itemvar', '') iv = data.get('itemvar', '')
if iv.startswith('q-'): if iv.startswith('q-'):
quotaid = iv[2:] quotaid = iv[2:]
elif '-' in iv: elif '-' in iv:
@@ -331,7 +332,8 @@ class VoucherBulkEditForm(VoucherForm):
quota_diff = Counter() quota_diff = Counter()
current_vouchers = self.queryset.order_by().values( current_vouchers = self.queryset.order_by().values(
"item", "variation", "quota", "block_quota", "valid_until", "subevent", "redeemed", "max_usages" "item", "variation", "quota", "block_quota", "valid_until", "subevent", "redeemed", "max_usages",
"allow_ignore_quota",
).annotate(c=Count("*")) ).annotate(c=Count("*"))
item_cache = {i.pk: i for i in Item.objects.filter(pk__in=[c["item"] for c in current_vouchers])} item_cache = {i.pk: i for i in Item.objects.filter(pk__in=[c["item"] for c in current_vouchers])}
var_cache = {v.pk: v for v in ItemVariation.objects.filter(pk__in=[c["variation"] for c in current_vouchers])} var_cache = {v.pk: v for v in ItemVariation.objects.filter(pk__in=[c["variation"] for c in current_vouchers])}