Merge branch 'django110'

This commit is contained in:
Raphael Michel
2016-10-03 10:31:49 +02:00
26 changed files with 130 additions and 116 deletions

View File

@@ -1,11 +1,12 @@
from django.core.urlresolvers import resolve
from django.utils.deprecation import MiddlewareMixin
from pretix.presale.signals import process_response
from .utils import _detect_event
class EventMiddleware:
class EventMiddleware(MiddlewareMixin):
def process_request(self, request):
url = resolve(request.path_info)
request._namespace = url.namespace

View File

@@ -60,7 +60,7 @@ def _detect_event(request):
LocaleMiddleware().process_request(request)
if not request.event.live:
if not request.user.is_authenticated() or not EventPermission.objects.filter(
if not request.user.is_authenticated or not EventPermission.objects.filter(
event=request.event, user=request.user).exists():
raise PermissionDenied(_('The selected ticket shop is currently not available.'))

View File

@@ -15,7 +15,7 @@ class LocaleSet(View):
locale = request.GET.get('locale')
if locale in [lc for lc, ll in settings.LANGUAGES]:
if request.user.is_authenticated():
if request.user.is_authenticated:
request.user.locale = locale
request.user.save()