forked from CGM_Public/pretix_original
Django 1.10: User.is_authenticated is now a property
This commit is contained in:
@@ -43,7 +43,7 @@ class LocaleMiddleware(MiddlewareMixin):
|
|||||||
request.LANGUAGE_CODE = translation.get_language()
|
request.LANGUAGE_CODE = translation.get_language()
|
||||||
|
|
||||||
tzname = None
|
tzname = None
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
tzname = request.user.timezone
|
tzname = request.user.timezone
|
||||||
if hasattr(request, 'event'):
|
if hasattr(request, 'event'):
|
||||||
tzname = request.event.settings.timezone
|
tzname = request.event.settings.timezone
|
||||||
@@ -65,7 +65,7 @@ class LocaleMiddleware(MiddlewareMixin):
|
|||||||
|
|
||||||
|
|
||||||
def get_language_from_user_settings(request: HttpRequest) -> str:
|
def get_language_from_user_settings(request: HttpRequest) -> str:
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
lang_code = request.user.locale
|
lang_code = request.user.locale
|
||||||
if lang_code in _supported and lang_code is not None and check_for_language(lang_code):
|
if lang_code in _supported and lang_code is not None and check_for_language(lang_code):
|
||||||
return lang_code
|
return lang_code
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ class PermissionMiddleware(MiddlewareMixin):
|
|||||||
return redirect(urljoin(settings.SITE_URL, request.get_full_path()))
|
return redirect(urljoin(settings.SITE_URL, request.get_full_path()))
|
||||||
if url_name in self.EXCEPTIONS:
|
if url_name in self.EXCEPTIONS:
|
||||||
return
|
return
|
||||||
if not request.user.is_authenticated():
|
if not request.user.is_authenticated:
|
||||||
# Taken from django/contrib/auth/decorators.py
|
# Taken from django/contrib/auth/decorators.py
|
||||||
path = request.build_absolute_uri()
|
path = request.build_absolute_uri()
|
||||||
# urlparse chokes on lazy objects in Python 3, force to str
|
# urlparse chokes on lazy objects in Python 3, force to str
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ def event_permission_required(permission):
|
|||||||
"""
|
"""
|
||||||
def decorator(function):
|
def decorator(function):
|
||||||
def wrapper(request, *args, **kw):
|
def wrapper(request, *args, **kw):
|
||||||
if not request.user.is_authenticated(): # NOQA
|
if not request.user.is_authenticated: # NOQA
|
||||||
# just a double check, should not ever happen
|
# just a double check, should not ever happen
|
||||||
raise PermissionDenied()
|
raise PermissionDenied()
|
||||||
try:
|
try:
|
||||||
@@ -55,7 +55,7 @@ def organizer_permission_required(permission):
|
|||||||
"""
|
"""
|
||||||
def decorator(function):
|
def decorator(function):
|
||||||
def wrapper(request, *args, **kw):
|
def wrapper(request, *args, **kw):
|
||||||
if not request.user.is_authenticated(): # NOQA
|
if not request.user.is_authenticated: # NOQA
|
||||||
# just a double check, should not ever happen
|
# just a double check, should not ever happen
|
||||||
raise PermissionDenied()
|
raise PermissionDenied()
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ def login(request):
|
|||||||
parameter "next" for redirection after successful login
|
parameter "next" for redirection after successful login
|
||||||
"""
|
"""
|
||||||
ctx = {}
|
ctx = {}
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
return redirect(request.GET.get("next", 'control:index'))
|
return redirect(request.GET.get("next", 'control:index'))
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = LoginForm(data=request.POST)
|
form = LoginForm(data=request.POST)
|
||||||
@@ -56,7 +56,7 @@ def register(request):
|
|||||||
if not settings.PRETIX_REGISTRATION:
|
if not settings.PRETIX_REGISTRATION:
|
||||||
raise PermissionDenied('Registration is disabled')
|
raise PermissionDenied('Registration is disabled')
|
||||||
ctx = {}
|
ctx = {}
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
return redirect(request.GET.get("next", 'control:index'))
|
return redirect(request.GET.get("next", 'control:index'))
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = RegistrationForm(data=request.POST)
|
form = RegistrationForm(data=request.POST)
|
||||||
@@ -85,7 +85,7 @@ class Forgot(TemplateView):
|
|||||||
return super().dispatch(request, *args, **kwargs)
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
return redirect(request.GET.get("next", 'control:index'))
|
return redirect(request.GET.get("next", 'control:index'))
|
||||||
return super().get(request, *args, **kwargs)
|
return super().get(request, *args, **kwargs)
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@ class Recover(TemplateView):
|
|||||||
return super().dispatch(request, *args, **kwargs)
|
return super().dispatch(request, *args, **kwargs)
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
if request.user.is_authenticated():
|
if request.user.is_authenticated:
|
||||||
return redirect(request.GET.get("next", 'control:index'))
|
return redirect(request.GET.get("next", 'control:index'))
|
||||||
try:
|
try:
|
||||||
user = User.objects.get(id=self.request.GET.get('id'))
|
user = User.objects.get(id=self.request.GET.get('id'))
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ def _detect_event(request):
|
|||||||
LocaleMiddleware().process_request(request)
|
LocaleMiddleware().process_request(request)
|
||||||
|
|
||||||
if not request.event.live:
|
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():
|
event=request.event, user=request.user).exists():
|
||||||
raise PermissionDenied(_('The selected ticket shop is currently not available.'))
|
raise PermissionDenied(_('The selected ticket shop is currently not available.'))
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class LocaleSet(View):
|
|||||||
|
|
||||||
locale = request.GET.get('locale')
|
locale = request.GET.get('locale')
|
||||||
if locale in [lc for lc, ll in settings.LANGUAGES]:
|
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.locale = locale
|
||||||
request.user.save()
|
request.user.save()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user