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

Vouchers: Fix validation of quota when copying a blocking voucher (Z#23152799) (#4133)

Browse Source 
* Vouchers: Fix validation of quota when copying a blocking voucher

* Bugfixes
This commit is contained in:
Raphael Michel
2024-05-07 09:50:16 +02:00
committed by GitHub
parent 7a63498333
commit 5ca0833db1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pretix/base/models/vouchers.py
+1 -1
View File
@@ -460,7 +460,7 @@ class Voucher(LoggedModel):
new_quotas = set( new_quotas = set(
Quota.objects.filter( Quota.objects.filter(
pk__in=Quota.variations.through.objects.filter( pk__in=Quota.variations.through.objects.filter(
itemvariation__item=old_instance.item, itemvariation__item=item,
quota__subevent=data.get('subevent'), quota__subevent=data.get('subevent'),
).values('quota_id') ).values('quota_id')
) )
src/pretix/control/forms/vouchers.py
+5 -5
View File
@@ -90,8 +90,10 @@ class VoucherForm(I18nModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
instance = kwargs.get('instance') instance = kwargs.get('instance')
initial = kwargs.get('initial') initial = kwargs.get('initial')
self.initial_instance_data = None
if instance: if instance:
self.initial_instance_data = modelcopy(instance) if instance.pk:
self.initial_instance_data = modelcopy(instance)
try: try:
if instance.variation: if instance.variation:
initial['itemvar'] = '%d-%d' % (instance.item.pk, instance.variation.pk) initial['itemvar'] = '%d-%d' % (instance.item.pk, instance.variation.pk)
@@ -101,8 +103,6 @@ class VoucherForm(I18nModelForm):
initial['itemvar'] = 'q-%d' % instance.quota.pk initial['itemvar'] = 'q-%d' % instance.quota.pk
except Item.DoesNotExist: except Item.DoesNotExist:
pass pass
else:
self.initial_instance_data = None
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
if instance.event.has_subevents: if instance.event.has_subevents:
@@ -234,8 +234,8 @@ class VoucherForm(I18nModelForm):
) )
if check_quota: if check_quota:
Voucher.clean_quota_check( Voucher.clean_quota_check(
data, cnt, self.initial_instance_data, self.instance.event, data, cnt, self.initial_instance_data,
self.instance.quota, self.instance.item, self.instance.variation self.instance.event, self.instance.quota, self.instance.item, self.instance.variation
) )
Voucher.clean_voucher_code(data, self.instance.event, self.instance.pk) Voucher.clean_voucher_code(data, self.instance.event, self.instance.pk)
if 'seat' in self.fields and data.get('seat'): if 'seat' in self.fields and data.get('seat'):