Hopiu/wagtail
1
0
Fork 0
mirror of https://github.com/Hopiu/wagtail.git synced 2026-05-12 17:23:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Namespace password reset views

Browse source
This commit is contained in:
Karl Hobley 2015-01-19 13:56:08 +00:00
parent f887d948dc
commit b24a3a7ab4
4 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt
View file

@ -1,3 +1,3 @@
{% load i18n %}
{% trans "Please follow the link below to reset your password" %}
{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
{{ protocol }}://{{ domain }}{% url 'wagtailadmin_password_reset_confirm' uidb64=uid token=token %}

2
wagtail/wagtailadmin/templates/wagtailadmin/login.html
View file

@ -43,7 +43,7 @@
</div>
</div>
{% if show_password_reset %}
<p class="help"><a href="{% url 'django.contrib.auth.views.password_reset' %}">{% trans "Forgotten it?" %}</a></p>
<p class="help"><a href="{% url 'wagtailadmin_password_reset' %}">{% trans "Forgotten it?" %}</a></p>
{% endif %}
</li>
{% comment %}

22
wagtail/wagtailadmin/tests/test_account_management.py
View file

@ -299,7 +299,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
This tests that the password reset view returns a password reset page
"""
# Get password reset page
response = self.client.get(reverse('password_reset'))
response = self.client.get(reverse('wagtailadmin_password_reset'))
# Check that the user recieved a password reset page
self.assertEqual(response.status_code, 200)
@ -314,10 +314,10 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
post_data = {
'email': 'test@email.com',
}
response = self.client.post(reverse('password_reset'), post_data)
response = self.client.post(reverse('wagtailadmin_password_reset'), post_data)
# Check that the user was redirected to the done page
self.assertRedirects(response, reverse('password_reset_done'))
self.assertRedirects(response, reverse('wagtailadmin_password_reset_done'))
# Check that a password reset email was sent to the user
self.assertEqual(len(mail.outbox), 1)
@ -332,7 +332,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
post_data = {
'email': 'unknown@email.com',
}
response = self.client.post(reverse('password_reset'), post_data)
response = self.client.post(reverse('wagtailadmin_password_reset'), post_data)
# Check that the user wasn't redirected
self.assertEqual(response.status_code, 200)
@ -352,7 +352,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
post_data = {
'email': 'Hello world!',
}
response = self.client.post(reverse('password_reset'), post_data)
response = self.client.post(reverse('wagtailadmin_password_reset'), post_data)
# Check that the user wasn't redirected
self.assertEqual(response.status_code, 200)
@ -387,7 +387,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
self.setup_password_reset_confirm_tests()
# Get password reset confirm page
response = self.client.get(reverse('password_reset_confirm', kwargs=self.url_kwargs))
response = self.client.get(reverse('wagtailadmin_password_reset_confirm', kwargs=self.url_kwargs))
# Check that the user recieved a password confirm done page
self.assertEqual(response.status_code, 200)
@ -405,10 +405,10 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
'new_password1': 'newpassword',
'new_password2': 'newpassword',
}
response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
response = self.client.post(reverse('wagtailadmin_password_reset_confirm', kwargs=self.url_kwargs), post_data)
# Check that the user was redirected to the complete page
self.assertRedirects(response, reverse('password_reset_complete'))
self.assertRedirects(response, reverse('wagtailadmin_password_reset_complete'))
# Check that the password was changed
self.assertTrue(get_user_model().objects.get(username='test').check_password('newpassword'))
@ -425,7 +425,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
'new_password1': 'newpassword',
'new_password2': 'badpassword',
}
response = self.client.post(reverse('password_reset_confirm', kwargs=self.url_kwargs), post_data)
response = self.client.post(reverse('wagtailadmin_password_reset_confirm', kwargs=self.url_kwargs), post_data)
# Check that the user wasn't redirected
self.assertEqual(response.status_code, 200)
@ -442,7 +442,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
This tests that the password reset done view returns a password reset done page
"""
# Get password reset done page
response = self.client.get(reverse('password_reset_done'))
response = self.client.get(reverse('wagtailadmin_password_reset_done'))
# Check that the user recieved a password reset done page
self.assertEqual(response.status_code, 200)
@ -453,7 +453,7 @@ class TestPasswordReset(TestCase, WagtailTestUtils):
This tests that the password reset complete view returns a password reset complete page
"""
# Get password reset complete page
response = self.client.get(reverse('password_reset_complete'))
response = self.client.get(reverse('wagtailadmin_password_reset_complete'))
# Check that the user recieved a password reset complete page
self.assertEqual(response.status_code, 200)

18
wagtail/wagtailadmin/urls.py
View file

@ -96,22 +96,24 @@ urlpatterns += [
'email_template_name': 'wagtailadmin/account/password_reset/email.txt',
'subject_template_name': 'wagtailadmin/account/password_reset/email_subject.txt',
'password_reset_form': PasswordResetForm,
}, name='password_reset'
'post_reset_redirect': 'wagtailadmin_password_reset_done',
}, name='wagtailadmin_password_reset'
),
url(
r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done', {
'template_name': 'wagtailadmin/account/password_reset/done.html'
}, name='password_reset_done'
}, name='wagtailadmin_password_reset_done'
),
url(
r'^password_reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
'django.contrib.auth.views.password_reset_confirm',
{'template_name': 'wagtailadmin/account/password_reset/confirm.html'},
name='password_reset_confirm',
'django.contrib.auth.views.password_reset_confirm', {
'template_name': 'wagtailadmin/account/password_reset/confirm.html',
'post_reset_redirect': 'wagtailadmin_password_reset_complete',
}, name='wagtailadmin_password_reset_confirm',
),
url(
r'^password_reset/complete/$', 'django.contrib.auth.views.password_reset_complete',
{'template_name': 'wagtailadmin/account/password_reset/complete.html'},
name='password_reset_complete'
r'^password_reset/complete/$', 'django.contrib.auth.views.password_reset_complete',{
'template_name': 'wagtailadmin/account/password_reset/complete.html'
}, name='wagtailadmin_password_reset_complete'
),
]