Allow to set event_list_type on event level

This commit is contained in:
Raphael Michel
2020-04-27 18:06:37 +02:00
parent 4ec24fc884
commit 88a235da30
4 changed files with 22 additions and 1 deletions

View File

@@ -555,6 +555,7 @@ class EventSettingsSerializer(serializers.Serializer):
'meta_noindex', 'meta_noindex',
'redirect_to_checkout_directly', 'redirect_to_checkout_directly',
'frontpage_subevent_ordering', 'frontpage_subevent_ordering',
'event_list_type',
'frontpage_text', 'frontpage_text',
'attendee_names_asked', 'attendee_names_asked',
'attendee_names_required', 'attendee_names_required',

View File

@@ -880,7 +880,22 @@ DEFAULTS = {
}, },
'event_list_type': { 'event_list_type': {
'default': 'list', 'default': 'list',
'type': str 'type': str,
'form_class': forms.ChoiceField,
'serializer_class': serializers.ChoiceField,
'serializer_kwargs': dict(
choices=(
('list', _('List')),
('calendar', _('Calendar'))
)
),
'form_kwargs': dict(
label=_('Default overview style'),
choices=(
('list', _('List')),
('calendar', _('Calendar'))
)
),
}, },
'last_order_modification_date': { 'last_order_modification_date': {
'default': None, 'default': None,

View File

@@ -510,6 +510,7 @@ class EventSettingsForm(SettingsForm):
'meta_noindex', 'meta_noindex',
'redirect_to_checkout_directly', 'redirect_to_checkout_directly',
'frontpage_subevent_ordering', 'frontpage_subevent_ordering',
'event_list_type',
'frontpage_text', 'frontpage_text',
'attendee_names_asked', 'attendee_names_asked',
'attendee_names_required', 'attendee_names_required',
@@ -557,6 +558,7 @@ class EventSettingsForm(SettingsForm):
] ]
if not self.event.has_subevents: if not self.event.has_subevents:
del self.fields['frontpage_subevent_ordering'] del self.fields['frontpage_subevent_ordering']
del self.fields['event_list_type']
self.fields['primary_font'].choices += [ self.fields['primary_font'].choices += [
(a, {"title": a, "data": v}) for a, v in get_fonts().items() (a, {"title": a, "data": v}) for a, v in get_fonts().items()
] ]

View File

@@ -141,6 +141,9 @@
{% if sform.frontpage_subevent_ordering %} {% if sform.frontpage_subevent_ordering %}
{% bootstrap_field sform.frontpage_subevent_ordering layout="control" %} {% bootstrap_field sform.frontpage_subevent_ordering layout="control" %}
{% endif %} {% endif %}
{% if sform.event_list_type %}
{% bootstrap_field sform.event_list_type layout="control" %}
{% endif %}
</fieldset> </fieldset>
<fieldset> <fieldset>
<legend>{% trans "Cart" %}</legend> <legend>{% trans "Cart" %}</legend>