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

Use internal name of product in filter forms

Browse Source
This commit is contained in:
Raphael Michel
2022-04-06 13:08:16 +02:00
parent d1745bb703
commit bcee2c231a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pretix/control/forms/filter.py
View File

@@ -1859,11 +1859,11 @@ class VoucherFilterForm(FilterForm):
for i in self.event.items.prefetch_related('variations').all(): for i in self.event.items.prefetch_related('variations').all():
variations = list(i.variations.all()) variations = list(i.variations.all())
if variations: if variations:
choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name))) choices.append((str(i.pk), _('{product} – Any variation').format(product=str(i))))
for v in variations: for v in variations:
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value))) choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (str(i), v.value)))
else: else:
choices.append((str(i.pk), i.name)) choices.append((str(i.pk), str(i)))
for q in self.event.quotas.all(): for q in self.event.quotas.all():
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)))
self.fields['itemvar'].choices = choices self.fields['itemvar'].choices = choices
@@ -2141,11 +2141,11 @@ class CheckinFilterForm(FilterForm):
for i in self.event.items.prefetch_related('variations').all(): for i in self.event.items.prefetch_related('variations').all():
variations = list(i.variations.all()) variations = list(i.variations.all())
if variations: if variations:
choices.append((str(i.pk), _('{product} – Any variation').format(product=i.name))) choices.append((str(i.pk), _('{product} – Any variation').format(product=str(i))))
for v in variations: for v in variations:
choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (i.name, v.value))) choices.append(('%d-%d' % (i.pk, v.pk), '%s – %s' % (str(i), v.value)))
else: else:
choices.append((str(i.pk), i.name)) choices.append((str(i.pk), str(i)))
self.fields['itemvar'].choices = choices self.fields['itemvar'].choices = choices
def filter_qs(self, qs): def filter_qs(self, qs):