From 32f2dddaa359324b312bbb087369c6186ecfd1b8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karlhobley10@gmail.com>
Date: Mon, 19 Jan 2015 14:05:55 +0000
Subject: [PATCH] Set default login redirect to dashboard

No longer need to specify LOGIN_REDIRECT_URL
---
 wagtail/project_template/project_name/settings/base.py | 2 --
 wagtail/wagtailadmin/templates/wagtailadmin/login.html | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wagtail/project_template/project_name/settings/base.py b/wagtail/project_template/project_name/settings/base.py
index 9bc27faca..d3cbbe729 100644
--- a/wagtail/project_template/project_name/settings/base.py
+++ b/wagtail/project_template/project_name/settings/base.py
@@ -143,8 +143,6 @@ TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
 
 # Wagtail settings
 
-LOGIN_REDIRECT_URL = 'wagtailadmin_home'
-
 WAGTAIL_SITE_NAME = "{{ project_name }}"
 
 # Use Elasticsearch as the search backend for extra performance and better search results:
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
index c975cd61a..52df5036c 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html
@@ -22,7 +22,10 @@
 
         <form action="{% url 'wagtailadmin_login' %}" method="post" autocomplete="off">
             {% csrf_token %}
-            <input type="hidden" name="next" value="{{ next }}" />
+
+            {% url 'wagtailadmin_home' as home_url %}
+            <input type="hidden" name="next" value="{{ next|default:home_url }}" />
+
             <h1>{% trans "Sign in to Wagtail" %}</h1>