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

Fix failing tests

Browse Source
This commit is contained in:
Raphael Michel
2020-11-17 14:23:55 +01:00
parent 821599dc1a
commit 0bd1c3f3af
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/development/api/general.rst
View File

@@ -58,7 +58,7 @@ Backend
.. automodule:: pretix.control.signals .. automodule:: pretix.control.signals
:members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings, :members: nav_event, html_head, html_page_start, quota_detail_html, nav_topbar, nav_global, nav_organizer, nav_event_settings,
order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms, order_info, event_settings_widget, oauth_application_registered, order_position_buttons, subevent_forms,
item_formsets, order_search_filter_q item_formsets, order_search_filter_q, order_search_forms
.. automodule:: pretix.base.signals .. automodule:: pretix.base.signals
:members: logentry_display, logentry_object_link, requiredaction_display, timeline_events :members: logentry_display, logentry_object_link, requiredaction_display, timeline_events

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

@@ -452,9 +452,6 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
sales_channel = forms.ChoiceField( sales_channel = forms.ChoiceField(
label=_('Sales channel'), label=_('Sales channel'),
required=False, required=False,
choices=[('', '')] + [
(k, v.verbose_name) for k, v in get_all_sales_channels().items()
]
) )
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@@ -467,6 +464,10 @@ class EventOrderExpertFilterForm(EventOrderFilterForm):
del self.fields['subevents_from'] del self.fields['subevents_from']
del self.fields['subevents_to'] del self.fields['subevents_to']
self.fields['sales_channel'].choices = [('', '')] + [
(k, v.verbose_name) for k, v in get_all_sales_channels().items()
]
locale_names = dict(settings.LANGUAGES) locale_names = dict(settings.LANGUAGES)
self.fields['locale'].choices = [('', '')] + [(a, locale_names[a]) for a in self.event.settings.locales] self.fields['locale'].choices = [('', '')] + [(a, locale_names[a]) for a in self.event.settings.locales]