From c420b17f2b7f8404724f595b79b387f1c7ab2045 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 14 Feb 2014 12:47:21 +0000
Subject: [PATCH 1/2] Revert "Change login view to the login_wrapper view"

This reverts commit 193b75e1526ebd5bbc96a4a9639129664c579672.
---
 wagtail/wagtailadmin/urls.py          | 16 ++++++++--------
 wagtail/wagtailadmin/views/account.py |  3 ++-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py
index 93b78bed38..b265919052 100644
--- a/wagtail/wagtailadmin/urls.py
+++ b/wagtail/wagtailadmin/urls.py
@@ -6,6 +6,13 @@ from wagtail.wagtailadmin.forms import LoginForm, PasswordResetForm
 
 urlpatterns = patterns(
     'django.contrib.auth.views',
+    url(
+        r'^login/$', 'login', {
+            'template_name': 'wagtailadmin/login.html',
+            'authentication_form': LoginForm,
+            'extra_context': {'show_password_reset': getattr(settings, 'WAGTAIL_PASSWORD_MANAGEMENT_ENABLED', True)},
+        } , name='wagtailadmin_login'
+    ),
     url(r'^logout/$', 'logout', {'next_page': 'wagtailadmin_login'}),
 
     # Password reset
@@ -72,11 +79,4 @@ urlpatterns += patterns(
 
     url(r'^account/$', 'account.account', name='wagtailadmin_account'),
     url(r'^account/change_password/$', 'account.change_password', name='wagtailadmin_account_change_password'),
-    url(
-        r'^login/$', 'account.login_wrapper', {
-            'template_name': 'wagtailadmin/login.html',
-            'authentication_form': LoginForm,
-            'extra_context': {'show_password_reset': getattr(settings, 'WAGTAIL_PASSWORD_MANAGEMENT_ENABLED', True)},
-        } , name='wagtailadmin_login'
-    ),
-)
\ No newline at end of file
+)
diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index 2bac17ac65..7188f37a75 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -38,4 +38,5 @@ def login_wrapper(request, **kwargs):
     if request.user.is_authenticated():
         return redirect(settings.LOGIN_REDIRECT_URL)
     else:
-        return login(request, **kwargs)
\ No newline at end of file
+        return login(request, **kwargs)
+        

From 9023432f5a44eba245acfa02e6a12004c9ef15d8 Mon Sep 17 00:00:00 2001
From: Karl Hobley <karl@torchbox.com>
Date: Fri, 14 Feb 2014 12:47:34 +0000
Subject: [PATCH 2/2] Revert "Create login_wrapper view"

This reverts commit 4f914fdc57a835eb692ebfce5ba22d9f4ed7af20.
---
 wagtail/wagtailadmin/views/account.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/wagtail/wagtailadmin/views/account.py b/wagtail/wagtailadmin/views/account.py
index 7188f37a75..b352d06b31 100644
--- a/wagtail/wagtailadmin/views/account.py
+++ b/wagtail/wagtailadmin/views/account.py
@@ -2,7 +2,6 @@ from django.conf import settings
 from django.shortcuts import render, redirect
 from django.contrib import messages
 from django.contrib.auth.forms import SetPasswordForm
-from django.contrib.auth.views import login
 
 
 def account(request):
@@ -32,11 +31,3 @@ def change_password(request):
         'form': form,
         'can_change_password': can_change_password,
     })
-
-# Wrap login view to prevent logged in users accessing the page
-def login_wrapper(request, **kwargs):
-    if request.user.is_authenticated():
-        return redirect(settings.LOGIN_REDIRECT_URL)
-    else:
-        return login(request, **kwargs)
-