From 6f8201fe93b3e0cc80b52c28b850ebb32d30e5aa Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 20 Sep 2016 20:40:49 +1200 Subject: Fixes for django-registration 2.x * Newer django-registration doesn't need the workaround URLs * We need to rename password_reset_email.html to .txt Signed-off-by: Paul Eggleton --- urls.py | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 8b5c9f6875..649635c96f 100644 --- a/urls.py +++ b/urls.py @@ -7,7 +7,6 @@ from django.conf.urls import patterns, include, url from django.views.generic import RedirectView -from django.contrib.auth import views as auth_views from django.contrib import admin admin.autodiscover() @@ -15,27 +14,6 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^layerindex/', include('layerindex.urls')), url(r'^admin/', include(admin.site.urls)), - - # override the default auth urls since django-registration 1.0 isn't Django 1.6 compatible - url(r'^password/change/$', - auth_views.password_change, - name='password_change'), - url(r'^password/change/done/$', - auth_views.password_change_done, - name='password_change_done'), - url(r'^password/reset/$', - auth_views.password_reset, - name='password_reset'), - url(r'^password/reset/done/$', - auth_views.password_reset_done, - name='password_reset_done'), - url(r'^password/reset/complete/$', - auth_views.password_reset_complete, - name='password_reset_complete'), - url(r'^password/reset/confirm/(?P[0-9A-Za-z]+)-(?P.+)/$', - auth_views.password_reset_confirm, - name='auth_password_reset_confirm'), - url(r'^accounts/', include('registration.backends.default.urls')), url(r'^captcha/', include('captcha.urls')), url(r'.*', RedirectView.as_view(url='/layerindex/', permanent=False)), -- cgit 1.2.3-korg