diff --git a/src/pretix/base/settings.py b/src/pretix/base/settings.py index 3979ce9ffa..9116547e0d 100644 --- a/src/pretix/base/settings.py +++ b/src/pretix/base/settings.py @@ -175,6 +175,10 @@ DEFAULTS = { 'default': 'True', 'type': bool }, + 'event_list_type': { + 'default': 'list', + 'type': str + }, 'last_order_modification_date': { 'default': None, 'type': datetime diff --git a/src/pretix/base/validators.py b/src/pretix/base/validators.py index cae0b65553..d5f8c3fa60 100644 --- a/src/pretix/base/validators.py +++ b/src/pretix/base/validators.py @@ -31,6 +31,7 @@ class EventSlugBlacklistValidator(BlacklistValidator): '_global', '__debug__', 'api', + 'events', ] diff --git a/src/pretix/control/forms/organizer.py b/src/pretix/control/forms/organizer.py index 6549b60e15..833f6792ff 100644 --- a/src/pretix/control/forms/organizer.py +++ b/src/pretix/control/forms/organizer.py @@ -126,3 +126,11 @@ class OrganizerSettingsForm(SettingsForm): help_text=_('If you provide a logo image, we will by default not show your organization name ' 'in the page header. We will show your logo with a maximal height of 120 pixels.') ) + + event_list_type = forms.ChoiceField( + label=_('Event overview stile'), + choices=( + ('list', _('List')), + ('calendar', _('Calendar')) + ) + ) diff --git a/src/pretix/control/templates/pretixcontrol/organizers/edit.html b/src/pretix/control/templates/pretixcontrol/organizers/edit.html index 477fd4ab20..8391d7fd37 100644 --- a/src/pretix/control/templates/pretixcontrol/organizers/edit.html +++ b/src/pretix/control/templates/pretixcontrol/organizers/edit.html @@ -21,6 +21,7 @@ {% bootstrap_field sform.locales layout="horizontal" %} {% bootstrap_field sform.organizer_logo_image layout="horizontal" %} {% bootstrap_field sform.organizer_homepage_text layout="horizontal" %} + {% bootstrap_field sform.event_list_type layout="horizontal" %}