From a6977aae4cf132936bb8646202aa4e34cf856a8b Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Wed, 1 Feb 2012 11:59:27 -0500 Subject: [PATCH] update routes and new password_reset --- auth/views.py | 13 +++++++------ urls.py | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/auth/views.py b/auth/views.py index 8336afa65b..df6980afb5 100644 --- a/auth/views.py +++ b/auth/views.py @@ -237,10 +237,11 @@ def password_reset(request): raise Http404 form = PasswordResetForm(request.POST) if form.is_valid(): - form.save( use_https = request.is_secure(), - from_email = settings.DEFAULT_FROM_EMAIL, + form.save( use_https = request.is_secure(), + from_email = settings.DEFAULT_FROM_EMAIL, request = request ) - return HttpResponse(json.dumps({'success':True})) - else: - return HttpResponse(json.dumps({'success':False, - 'error': 'Invalid e-mail'})) + return HttpResponse(json.dumps({'success':True, + 'value': render_to_string('registration/password_reset_done.html', {})})) + else: + return HttpResponse(json.dumps({'success':False, + 'error': 'Invalid e-mail'})) diff --git a/urls.py b/urls.py index 567d219506..bd9af13d21 100644 --- a/urls.py +++ b/urls.py @@ -17,9 +17,9 @@ urlpatterns = ('', url(r'^create_account$', 'auth.views.create_account'), url(r'^activate/(?P[^/]*)$', 'auth.views.activate_account'), url(r'^$', 'auth.views.index'), - url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', - dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'), -# url(r'^password_reset/$', 'auth.views.password_reset'), +# url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', +# dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'), + url(r'^password_reset/$', 'auth.views.password_reset'), url(r'^password_change/$',django.contrib.auth.views.password_change,name='auth_password_change'), url(r'^password_change_done/$',django.contrib.auth.views.password_change_done,name='auth_password_change_done'), url(r'^password_reset_confirm/(?P[0-9A-Za-z]+)-(?P.+)/$',django.contrib.auth.views.password_reset_confirm,