diff --git a/src/pretix/plugins/banktransfer/urls.py b/src/pretix/plugins/banktransfer/maindomain_urls.py similarity index 100% rename from src/pretix/plugins/banktransfer/urls.py rename to src/pretix/plugins/banktransfer/maindomain_urls.py diff --git a/src/pretix/plugins/paypal/urls.py b/src/pretix/plugins/paypal/maindomain_urls.py similarity index 73% rename from src/pretix/plugins/paypal/urls.py rename to src/pretix/plugins/paypal/maindomain_urls.py index 0354318ca1..753d788746 100644 --- a/src/pretix/plugins/paypal/urls.py +++ b/src/pretix/plugins/paypal/maindomain_urls.py @@ -3,7 +3,7 @@ from django.conf.urls import include, url from .views import abort, success urlpatterns = [ - url(r'^(?:(?P[^/]+)/)?(?P[^/]+)/paypal/', include([ + url(r'^(?P[^/]+)/(?P[^/]+)/paypal/', include([ url(r'^abort/$', abort, name='abort'), url(r'^return/$', success, name='return'), ])), diff --git a/src/pretix/plugins/paypal/subdomain_urls.py b/src/pretix/plugins/paypal/subdomain_urls.py new file mode 100644 index 0000000000..1f41a1e1c4 --- /dev/null +++ b/src/pretix/plugins/paypal/subdomain_urls.py @@ -0,0 +1,10 @@ +from django.conf.urls import include, url + +from .views import abort, success + +urlpatterns = [ + url(r'^(?P[^/]+)/paypal/', include([ + url(r'^abort/$', abort, name='abort'), + url(r'^return/$', success, name='return'), + ])), +] diff --git a/src/pretix/plugins/pretixdroid/urls.py b/src/pretix/plugins/pretixdroid/maindomain_urls.py similarity index 100% rename from src/pretix/plugins/pretixdroid/urls.py rename to src/pretix/plugins/pretixdroid/maindomain_urls.py diff --git a/src/pretix/plugins/sendmail/urls.py b/src/pretix/plugins/sendmail/maindomain_urls.py similarity index 100% rename from src/pretix/plugins/sendmail/urls.py rename to src/pretix/plugins/sendmail/maindomain_urls.py diff --git a/src/pretix/plugins/statistics/urls.py b/src/pretix/plugins/statistics/maindomain_urls.py similarity index 100% rename from src/pretix/plugins/statistics/urls.py rename to src/pretix/plugins/statistics/maindomain_urls.py diff --git a/src/pretix/plugins/stripe/urls.py b/src/pretix/plugins/stripe/maindomain_urls.py similarity index 100% rename from src/pretix/plugins/stripe/urls.py rename to src/pretix/plugins/stripe/maindomain_urls.py diff --git a/src/pretix/urls.py b/src/pretix/urls.py index 3882d0fe09..bba8892af9 100644 --- a/src/pretix/urls.py +++ b/src/pretix/urls.py @@ -1,7 +1,3 @@ -import importlib -import importlib.util - -from django.apps import apps from django.conf import settings from django.conf.urls import include, url @@ -27,17 +23,4 @@ if settings.DEBUG: debug_patterns.append(url(r'^__debug__/', include(debug_toolbar.urls))) -raw_plugin_patterns = [] -for app in apps.get_app_configs(): - if hasattr(app, 'PretixPluginMeta'): - if importlib.util.find_spec(app.name + '.urls'): - urlmod = importlib.import_module(app.name + '.urls') - raw_plugin_patterns.append( - url(r'', include(urlmod, namespace=app.label)) - ) - -plugin_patterns = [ - url(r'', include(raw_plugin_patterns, namespace='plugins')) -] - -common_patterns = base_patterns + control_patterns + debug_patterns + plugin_patterns +common_patterns = base_patterns + control_patterns + debug_patterns