From a85b96ea89cc40bcf393229b5d783c15a3a5f0a9 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 5 Oct 2018 09:31:14 +0200 Subject: [PATCH] Allow plugins to have organizer_patterns --- src/pretix/multidomain/maindomain_urlconf.py | 4 ++++ src/pretix/multidomain/subdomain_urlconf.py | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/src/pretix/multidomain/maindomain_urlconf.py b/src/pretix/multidomain/maindomain_urlconf.py index 7a4efd1d9..bc2274d3c 100644 --- a/src/pretix/multidomain/maindomain_urlconf.py +++ b/src/pretix/multidomain/maindomain_urlconf.py @@ -31,6 +31,10 @@ for app in apps.get_app_configs(): patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name) single_plugin_patterns.append(url(r'^(?P[^/]+)/(?P[^/]+)/', include(patterns))) + if hasattr(urlmod, 'organizer_patterns'): + patterns = urlmod.organizer_patterns + single_plugin_patterns.append(url(r'^(?P[^/]+)/', + include(patterns))) raw_plugin_patterns.append( url(r'', include((single_plugin_patterns, app.label))) ) diff --git a/src/pretix/multidomain/subdomain_urlconf.py b/src/pretix/multidomain/subdomain_urlconf.py index b34c767e5..90599cc34 100644 --- a/src/pretix/multidomain/subdomain_urlconf.py +++ b/src/pretix/multidomain/subdomain_urlconf.py @@ -27,6 +27,11 @@ for app in apps.get_app_configs(): raw_plugin_patterns.append( url(r'^(?P[^/]+)/', include((patterns, app.label))) ) + elif hasattr(urlmod, 'organizer_patterns'): + patterns = urlmod.organizer_patterns + raw_plugin_patterns.append( + url(include((patterns, app.label))) + ) elif importlib.util.find_spec(app.name + '.subdomain_urls'): # noqa warnings.warn('Please put your config in an \'urls\' module using the event_patterns '