From 030a02375c423f3820480afc2abd7a86fcc102b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Delobelle?= <aurelien.delobelle@gmail.com>
Date: Wed, 17 Jan 2018 15:42:55 +0100
Subject: [PATCH] Fix & clean login/logout urls

- Use the right slug for kfet root page.
- Redirection url of login and generic login now contains the query
string of the current request.
---
 kfet/templates/kfet/base_nav.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kfet/templates/kfet/base_nav.html b/kfet/templates/kfet/base_nav.html
index 1b71d8ca..7db5cdc5 100644
--- a/kfet/templates/kfet/base_nav.html
+++ b/kfet/templates/kfet/base_nav.html
@@ -91,7 +91,7 @@
           {% if user.username != 'kfet_genericteam' %}
           <li class="divider"></li>
           <li>
-            <a href="#" data-url="{% url "kfet.login.generic" %}" onclick="submit_url(this)">
+            <a href="#" data-url="{% url "kfet.login.generic" %}?next={{ request.get_full_path|urlencode }}" onclick="submit_url(this)">
               {% trans "Ouvrir une session partagée" %}
             </a>
           </li>
@@ -116,7 +116,7 @@
       </li>
       {% elif not user.is_authenticated %}
       <li>
-        <a href="{% url "account_login" %}?next={{ request.path|urlencode }}" title="{% trans "Connexion" %}">
+        <a href="{% url "account_login" %}?next={{ request.get_full_path|urlencode }}" title="{% trans "Connexion" %}">
           <span>{% trans "Connexion" %}</span><span class="glyphicon glyphicon-log-in"></span>
         </a>
       </li>