summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorHugo Osvaldo Barrera <hugo@barrera.io>2015-08-26 03:07:06 -0300
committerTim Graham <timograham@gmail.com>2016-02-04 10:35:37 -0500
commitdcee1dfc798bbf4602a35fb73f6acade9f5fd630 (patch)
tree3136c20778dc4a06f399bc8af6097f3639510c83 /django
parentad216381fcd7d3d62f1639f9998f5a965d8eaedb (diff)
Fixed #12405 -- Added LOGOUT_REDIRECT_URL setting.
After a user logs out via auth.views.logout(), they're redirected to LOGOUT_REDIRECT_URL if no `next_page` argument is provided.
Diffstat (limited to 'django')
-rw-r--r--django/conf/global_settings.py2
-rw-r--r--django/contrib/auth/views.py2
2 files changed, 4 insertions, 0 deletions
diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index b540fbc5a3..8eef00f2c1 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -489,6 +489,8 @@ LOGIN_URL = '/accounts/login/'
LOGIN_REDIRECT_URL = '/accounts/profile/'
+LOGOUT_REDIRECT_URL = None
+
# The number of days a password reset link is valid for
PASSWORD_RESET_TIMEOUT_DAYS = 3
diff --git a/django/contrib/auth/views.py b/django/contrib/auth/views.py
index fee3067646..e2387fea89 100644
--- a/django/contrib/auth/views.py
+++ b/django/contrib/auth/views.py
@@ -104,6 +104,8 @@ def logout(request, next_page=None,
if next_page is not None:
next_page = resolve_url(next_page)
+ elif settings.LOGOUT_REDIRECT_URL:
+ next_page = resolve_url(settings.LOGOUT_REDIRECT_URL)
if (redirect_field_name in request.POST or
redirect_field_name in request.GET):