Commit 079e5bf1 authored by Luke Plant's avatar Luke Plant
Browse files

Added a login link to the password reset completion screen. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8171 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 27d59729

django/contrib/admin/templates/registration/password_reset_complete.html

+2 −0
Original line number Diff line number Diff line
@@ -11,4 +11,6 @@ 


<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>



<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>



{% endblock %}

django/contrib/auth/views.py

+3 −1
Original line number Diff line number Diff line 
from django.conf import settings

from django.contrib.auth import REDIRECT_FIELD_NAME

from django.contrib.auth.decorators import login_required

from django.contrib.auth.forms import AuthenticationForm
@@ -130,7 +131,8 @@ def password_reset_confirm(request, uidb36=None, token=None, template_name='regi 
    return render_to_response(template_name, context_instance=context_instance)



def password_reset_complete(request, template_name='registration/password_reset_complete.html'):

    return render_to_response(template_name, context_instance=RequestContext(request))

    return render_to_response(template_name, context_instance=RequestContext(request,

                                                                             {'login_url': settings.LOGIN_URL}))



def password_change(request, template_name='registration/password_change_form.html'):

    if request.method == "POST":