From 08ca7539f27283f21374cc9a52ac462767fb0799 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 10 Jul 2018 14:49:48 +0200
Subject: [PATCH] logout redirect improved

---
 rowsandall_app/settings.py | 1 +
 rowsandall_app/urls.py     | 4 +++-
 templates/basebase.html    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py
index 3ebb23d1..542b46ef 100644
--- a/rowsandall_app/settings.py
+++ b/rowsandall_app/settings.py
@@ -224,6 +224,7 @@ MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 LOGIN_REDIRECT_URL = '/rowers/list-workouts/'
 LOGIN_URL = '/login/'
 LOGOUT_URL = '/logout/'
+LOGOUT_REDIRECT_URL = '/'
 
 # Update Cache with task progress password
 
diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py
index f129a657..66771e86 100644
--- a/rowsandall_app/urls.py
+++ b/rowsandall_app/urls.py
@@ -59,7 +59,9 @@ urlpatterns += [
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^$',rootview),
     url(r'^login/',auth_views.login, name='login'),
-    url(r'^logout/',auth_views.logout_then_login,name='logout'),
+    url(r'^logout/$',auth_views.logout,
+        {'next_page': '/'},
+        name='logout',),
     url(r'^rowers/',include('rowers.urls')),
     url(r'^cvkbrno/',include('cvkbrno.urls')),
     url(r'^admin/rq/',include('django_rq_dashboard.urls')),
diff --git a/templates/basebase.html b/templates/basebase.html
index 855c26fe..e3a1b755 100644
--- a/templates/basebase.html
+++ b/templates/basebase.html
@@ -144,7 +144,7 @@
 	    </div>
             <div class="grid_1">
 	      {% if user.is_authenticated %}
-	      <p><a class="button gray small" href="{% url 'logout' %}">logout</a></p>
+	      <p><a class="button gray small" href="{% url 'logout' %}?next=/login">logout</a></p>
 	      {% else %}
 	      <p>&nbsp</p>
 	      {% endif %}