logout redirect improved

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
 

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')),

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 %}