forked from CGM_Public/pretix_original
Upgrade to Django 2.1 (#710)
* Upgrade to Django 2.0 * more models * i18n foo * Update setup.py * Fix Sentry exception PRETIXEU-JC * Enforce slug uniqueness * Import sorting * Upgrade to Django 2.1 * Travis config * Try to fix PostgreSQL failure * Smaller test matrix * staticfiles→static * Include request in all authenticate() calls
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
from django.apps import AppConfig
|
||||
from django.urls import RegexURLPattern
|
||||
from django.urls import URLPattern
|
||||
from django.urls.resolvers import RegexPattern
|
||||
|
||||
|
||||
class PretixMultidomainConfig(AppConfig):
|
||||
@@ -10,10 +11,9 @@ class PretixMultidomainConfig(AppConfig):
|
||||
default_app_config = 'pretix.multidomain.PretixMultidomainConfig'
|
||||
|
||||
|
||||
def event_url(regex, view, kwargs=None, name=None, require_live=True):
|
||||
def event_url(route, view, name=None, require_live=True):
|
||||
if callable(view):
|
||||
r = RegexURLPattern(regex, view, kwargs, name)
|
||||
r._require_live = require_live
|
||||
return r
|
||||
else:
|
||||
raise TypeError('view must be a callable.')
|
||||
pattern = RegexPattern(route, name=name, is_endpoint=True)
|
||||
pattern._require_live = require_live
|
||||
return URLPattern(pattern, view, {}, name)
|
||||
raise TypeError('view must be a callable.')
|
||||
|
||||
@@ -7,9 +7,9 @@ from django.contrib.sessions.middleware import (
|
||||
)
|
||||
from django.core.cache import cache
|
||||
from django.core.exceptions import DisallowedHost
|
||||
from django.core.urlresolvers import set_urlconf
|
||||
from django.http.request import split_domain_port
|
||||
from django.middleware.csrf import CsrfViewMiddleware as BaseCsrfMiddleware
|
||||
from django.urls import set_urlconf
|
||||
from django.utils.cache import patch_vary_headers
|
||||
from django.utils.deprecation import MiddlewareMixin
|
||||
from django.utils.http import cookie_date
|
||||
|
||||
@@ -7,7 +7,7 @@ from pretix.base.models import Organizer
|
||||
|
||||
class KnownDomain(models.Model):
|
||||
domainname = models.CharField(max_length=255, primary_key=True)
|
||||
organizer = models.ForeignKey(Organizer, blank=True, null=True, related_name='domains')
|
||||
organizer = models.ForeignKey(Organizer, blank=True, null=True, related_name='domains', on_delete=models.CASCADE)
|
||||
|
||||
class Meta:
|
||||
verbose_name = _("Known domain")
|
||||
|
||||
@@ -7,5 +7,5 @@ def plugin_event_urls(urllist, plugin):
|
||||
plugin_event_urls(entry.url_patterns, plugin)
|
||||
elif hasattr(entry, 'callback'):
|
||||
entry.callback = _event_view(entry.callback, require_plugin=plugin,
|
||||
require_live=getattr(entry, '_require_live', True))
|
||||
require_live=getattr(entry.pattern, '_require_live', True))
|
||||
return urllist
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
from django import template
|
||||
from django.core.urlresolvers import NoReverseMatch
|
||||
from django.template import TemplateSyntaxError
|
||||
from django.template.base import kwarg_re
|
||||
from django.template.defaulttags import URLNode
|
||||
from django.urls import NoReverseMatch
|
||||
from django.utils.encoding import smart_text
|
||||
from django.utils.html import conditional_escape
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from urllib.parse import urljoin, urlsplit
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
|
||||
from pretix.base.models import Event, Organizer
|
||||
|
||||
|
||||
Reference in New Issue
Block a user