From 0a6e2797c4ba15a7833a039009e338d6c9bb2eb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= <laura@codingcatgirl.de>
Date: Tue, 4 Jul 2017 22:53:03 +0200
Subject: [PATCH] fix redirects in login links

---
 src/c3nav/editor/templates/editor/fragment_nav.html | 4 ++--
 src/c3nav/editor/views/changes.py                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/c3nav/editor/templates/editor/fragment_nav.html b/src/c3nav/editor/templates/editor/fragment_nav.html
index 33ab73fd..b5cc6c5b 100644
--- a/src/c3nav/editor/templates/editor/fragment_nav.html
+++ b/src/c3nav/editor/templates/editor/fragment_nav.html
@@ -9,9 +9,9 @@
     {% endif %}
     <li class="login_logout">
         {% if request.user.is_authenticated %}
-            <a href="{% url 'editor.logout' %}?redirect={{ request.path }}">{% trans 'Log out' %}</a>
+            <a href="{% url 'editor.logout' %}?r={{ request.path }}">{% trans 'Log out' %}</a>
         {% else %}
-            <a href="{% url 'editor.login' %}?redirect={{ request.path }}">{% trans 'Log in' %}</a>
+            <a href="{% url 'editor.login' %}?r={{ request.path }}">{% trans 'Log in' %}</a>
         {% endif %}
     </li>
 </ul>
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index 877aa516..848f6f8b 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -63,7 +63,7 @@ def changeset_detail(request, pk):
         elif request.POST.get('propose') == '1':
             if not request.user.is_authenticated:
                 messages.info(request, _('You need to log in to propose changes.'))
-                return redirect(reverse('editor.login')+'?redirect='+request.path)
+                return redirect(reverse('editor.login')+'?r='+request.path)
 
             with changeset.lock_to_edit() as changeset:
                 if changeset.can_propose(request):