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

Fix invalid voucher form submission

Browse Source
This commit is contained in:
Raphael Michel
2018-04-19 10:23:54 +02:00
parent 0119552336
commit a8321e8cd3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,8 +77,8 @@ class VoucherForm(I18nModelForm):
del self.fields['subevent'] del self.fields['subevent']
choices = [] choices = []
if 'itemvar' in initial: if 'itemvar' in initial or (self.data and 'itemvar' in self.data):
iv = initial.get('itemvar', '') iv = self.data.get('itemvar') or initial.get('itemvar', '')
if iv.startswith('q-'): if iv.startswith('q-'):
q = self.instance.event.quotas.get(pk=iv[2:]) q = self.instance.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)))
@@ -87,7 +87,7 @@ class VoucherForm(I18nModelForm):
i = self.instance.event.items.get(pk=itemid) i = self.instance.event.items.get(pk=itemid)
v = i.variations.get(pk=varid) v = i.variations.get(pk=varid)
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value))) choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value)))
else: elif iv:
i = self.instance.event.items.get(pk=iv) i = self.instance.event.items.get(pk=iv)
if i.variations.exists(): if i.variations.exists():
choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name))) choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name)))