Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-26 07:43:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Change login view to the login_wrapper view"

Browse source 
This reverts commit 193b75e152.
This commit is contained in:
Karl Hobley 2014-02-14 12:47:21 +00:00
parent 7b2eb66e2c
commit c420b17f2b
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
wagtail/wagtailadmin/urls.py
View file

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

3
wagtail/wagtailadmin/views/account.py
View file

@ -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)
return login(request, **kwargs)