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

Allow plugins to have organizer_patterns

Browse Source
This commit is contained in:
Raphael Michel
2018-10-05 09:31:14 +02:00
parent c2b5e876bc
commit a85b96ea89
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/multidomain/maindomain_urlconf.py
View File

@@ -31,6 +31,10 @@ for app in apps.get_app_configs():
patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name) patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
include(patterns))) include(patterns)))
if hasattr(urlmod, 'organizer_patterns'):
patterns = urlmod.organizer_patterns
single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/',
include(patterns)))
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'', include((single_plugin_patterns, app.label))) url(r'', include((single_plugin_patterns, app.label)))
) )

5
src/pretix/multidomain/subdomain_urlconf.py
View File

@@ -27,6 +27,11 @@ for app in apps.get_app_configs():
raw_plugin_patterns.append( raw_plugin_patterns.append(
url(r'^(?P<event>[^/]+)/', include((patterns, app.label))) url(r'^(?P<event>[^/]+)/', 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 elif importlib.util.find_spec(app.name + '.subdomain_urls'): # noqa
warnings.warn('Please put your config in an \'urls\' module using the event_patterns ' warnings.warn('Please put your config in an \'urls\' module using the event_patterns '