fix password_reset_confirm url rule to be compatible with django 1.6
it now crashes for django 1.5, the code needed for 1.5 is commented in nsupdate/login/urls.py
This commit is contained in:
parent
27e48d6457
commit
e42bf56de7
@ -13,7 +13,14 @@ urlpatterns = patterns(
|
|||||||
{'template_name': 'password_reset.html'}, name='password_reset'),
|
{'template_name': 'password_reset.html'}, name='password_reset'),
|
||||||
url(r'^password_reset_done/$', 'django.contrib.auth.views.password_reset_done',
|
url(r'^password_reset_done/$', 'django.contrib.auth.views.password_reset_done',
|
||||||
{'template_name': 'password_reset_done.html'}, name='password_reset_done'),
|
{'template_name': 'password_reset_done.html'}, name='password_reset_done'),
|
||||||
url(r'^password_reset_confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
|
# TODO: fix stuff below so it is compatible with django 1.5 AND 1.6:
|
||||||
|
# for django 1.5.x:
|
||||||
|
#url(r'^password_reset_confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
|
||||||
|
# 'django.contrib.auth.views.password_reset_confirm',
|
||||||
|
# {'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),
|
||||||
|
#
|
||||||
|
# for django 1.6.x:
|
||||||
|
url(r'^password_reset_confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
|
||||||
'django.contrib.auth.views.password_reset_confirm',
|
'django.contrib.auth.views.password_reset_confirm',
|
||||||
{'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),
|
{'template_name': 'password_reset_confirm.html'}, name='password_reset_confirm'),
|
||||||
url(r'^password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete',
|
url(r'^password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user