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

Refs #96 -- Completely removed local users

Browse Source
This commit is contained in:
Raphael Michel
2015-09-17 00:52:36 +02:00
parent 0dccdcb0f7
commit 7def097dcd
37 changed files with 367 additions and 707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/pretix/control/views/auth.py
View File

@@ -4,10 +4,8 @@ from django.contrib.auth import (
)
from django.shortcuts import redirect, render
from pretix.base.forms.auth import LoginForm, RegistrationForm
from pretix.base.models import User
from pretix.control.forms.auth import (
AuthenticationForm, GlobalRegistrationForm,
)
def login(request):
@@ -21,14 +19,14 @@ def login(request):
return redirect(request.GET.get("next", 'control:index'))
return redirect('control:index')
if request.method == 'POST':
form = AuthenticationForm(data=request.POST)
form = LoginForm(data=request.POST)
if form.is_valid() and form.user_cache:
auth_login(request, form.user_cache)
if "next" in request.GET:
return redirect(request.GET.get("next", 'control:index'))
return redirect('control:index')
else:
form = AuthenticationForm()
form = LoginForm()
ctx['form'] = form
return render(request, 'pretixcontrol/auth/login.html', ctx)
@@ -51,17 +49,17 @@ def register(request):
return redirect(request.GET.get("next", 'control:index'))
return redirect('control:index')
if request.method == 'POST':
form = GlobalRegistrationForm(data=request.POST)
form = RegistrationForm(data=request.POST)
if form.is_valid():
user = User.objects.create_global_user(
user = User.objects.create_user(
form.cleaned_data['email'], form.cleaned_data['password'],
locale=request.LANGUAGE_CODE,
timezone=request.timezone if hasattr(request, 'timezone') else settings.TIME_ZONE
)
user = authenticate(identifier=user.identifier, password=form.cleaned_data['password'])
user = authenticate(email=user.email, password=form.cleaned_data['password'])
auth_login(request, user)
return redirect('control:index')
else:
form = GlobalRegistrationForm()
form = RegistrationForm()
ctx['form'] = form
return render(request, 'pretixcontrol/auth/register.html', ctx)