Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #21826 -- Fixed password reset views.

  • Loading branch information...
commit aa64079e3957ab16a03a7d8e88c74c53c4a6477d 1 parent 104e726
Baptiste Mispelon bmispelon authored
10 accounts/urls.py
View
@@ -19,15 +19,7 @@
account_views.edit_profile,
name='edit_profile',
),
- url(
- r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
- auth_views.password_reset_confirm,
- name='auth_password_reset_confim',
- ),
- url(
- r'^reset/done/$',
- auth_views.password_reset_complete,
- ),
url(r'^_trac/userinfo/$', account_views.json_user_info),
+ url(r'', include('django.contrib.auth.urls')),
url(r'', include('registration.backends.default.urls')),
)
0  templates/registration/logout.html → templates/registration/logged_out.html
View
File renamed without changes
6 templates/registration/password_reset_email.html
View
@@ -1,10 +1,10 @@
{% load i18n %}{% autoescape off %}
-{% trans "You're receiving this e-mail because you requested a password reset" %}
-{% blocktrans %}for your user account at {{ site_name }}{% endblocktrans %}.
+{% blocktrans %}You're receiving this e-mail because you requested a password reset
+for your user account at {{ site_name }}{% endblocktrans %}.
{% trans "Please go to the following page and choose a new password:" %}
{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}
+{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
{% endblock %}
{% trans "Your username, in case you've forgotten:" %} {{ user.username }}
Please sign in to comment.
Something went wrong with that request. Please try again.