diff --git a/src/pretix/control/forms/item.py b/src/pretix/control/forms/item.py index 6b41cc4b87..d511698a0a 100644 --- a/src/pretix/control/forms/item.py +++ b/src/pretix/control/forms/item.py @@ -245,7 +245,7 @@ class QuotaForm(I18nModelForm): 'event': self.event.slug, 'organizer': self.event.organizer.slug, }), - 'data-placeholder': _('All products') + 'data-placeholder': _('No products') }, choices=choices, ) diff --git a/src/pretix/control/views/subevents.py b/src/pretix/control/views/subevents.py index 0348bbf30d..0686596f10 100644 --- a/src/pretix/control/views/subevents.py +++ b/src/pretix/control/views/subevents.py @@ -281,7 +281,7 @@ class SubEventEditorMixin(MetaDataEditorMixin): 'name': q.name, 'release_after_exit': q.release_after_exit, 'ignore_for_event_availability': q.ignore_for_event_availability, - 'itemvars': [str(i.pk) for i in q.items.all()] + [ + 'itemvars': [str(i.pk) for i in q.items.all() if (len(i.variations.all()) == 0)] + [ '{}-{}'.format(v.item_id, v.pk) for v in q.variations.all() ] } for q in self.copy_from.quotas.prefetch_related('items', 'variations')