CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-08 15:44:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to Django 3.2 (#2056)

Browse Source
This commit is contained in:
Raphael Michel
2021-05-07 12:00:30 +02:00
committed by GitHub
parent 0a7a3537eb
commit 403b8191e4
120 changed files with 1994 additions and 1555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,7 @@
import importlib.util
from django.apps import apps
from django.conf.urls import include, url
from django.conf.urls import include, re_path
from django.views.generic import TemplateView
from pretix.multidomain.plugin_handler import plugin_event_urls
@@ -45,10 +45,10 @@ from pretix.presale.urls import (
from pretix.urls import common_patterns
presale_patterns_main = [
url(r'', include((locale_patterns + [
url(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)),
url(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'), name="index")
re_path(r'', include((locale_patterns + [
re_path(r'^(?P<organizer>[^/]+)/', include(organizer_patterns)),
re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/', include(event_patterns)),
re_path(r'^$', TemplateView.as_view(template_name='pretixpresale/index.html'), name="index")
], 'presale')))
]
@@ -62,18 +62,18 @@ for app in apps.get_app_configs():
single_plugin_patterns += urlmod.urlpatterns
if hasattr(urlmod, 'event_patterns'):
patterns = plugin_event_urls(urlmod.event_patterns, plugin=app.name)
single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
include(patterns)))
single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/(?P<event>[^/]+)/',
include(patterns)))
if hasattr(urlmod, 'organizer_patterns'):
patterns = urlmod.organizer_patterns
single_plugin_patterns.append(url(r'^(?P<organizer>[^/]+)/',
include(patterns)))
single_plugin_patterns.append(re_path(r'^(?P<organizer>[^/]+)/',
include(patterns)))
raw_plugin_patterns.append(
url(r'', include((single_plugin_patterns, app.label)))
re_path(r'', include((single_plugin_patterns, app.label)))
)
plugin_patterns = [
url(r'', include((raw_plugin_patterns, 'plugins')))
re_path(r'', include((raw_plugin_patterns, 'plugins')))
]
# The presale namespace comes last, because it contains a wildcard catch