Merge pull request #42 from kaedroho/master

Revert #38

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

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,10 +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)