2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

change changeset ownership on login

Browse source
This commit is contained in:
Laura Klünder 2017-06-18 20:53:05 +02:00
parent 33e9c2b1f6
commit b6d2445250
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/c3nav/editor/views.py
View file

@ -485,14 +485,20 @@ def changeset_detail(request, pk):
@sidebar_view @sidebar_view
def login_view(request): def login_view(request):
redirect_path = request.GET['r'] if request.GET.get('r', '').startswith('/editor/') else reverse('editor.index')
if request.user.is_authenticated:
return redirect(redirect_path)
if request.method == 'POST': if request.method == 'POST':
form = AuthenticationForm(request, data=request.POST) form = AuthenticationForm(request, data=request.POST)
if form.is_valid(): if form.is_valid():
login(request, form.user_cache) login(request, form.user_cache)
print(request.GET.get('redirect', ''))
if request.GET.get('redirect', '').startswith('/editor/'): request.changeset.author = form.user_cache
return redirect(request.GET.get('redirect', '')) request.changeset.save()
return redirect(reverse('editor.index')) request.session['changeset_pk'] = request.changeset.pk
return redirect(redirect_path)
else: else:
form = AuthenticationForm(request) form = AuthenticationForm(request)
@ -501,7 +507,6 @@ def login_view(request):
@sidebar_view @sidebar_view
def logout_view(request): def logout_view(request):
redirect_path = request.GET['r'] if request.GET.get('r', '').startswith('/editor/') else reverse('editor.login')
logout(request) logout(request)
if request.GET.get('redirect', '').startswith('/editor/'): return redirect(redirect_path)
return redirect(request.GET.get('redirect', ''))
return redirect(reverse('editor.login'))