diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt index c30d3f277..b9b64d35e 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt +++ b/wagtail/wagtailadmin/templates/wagtailadmin/account/password_reset/email.txt @@ -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 %} \ No newline at end of file +{{ protocol }}://{{ domain }}{% url 'wagtailadmin_password_reset_confirm' uidb64=uid token=token %} \ No newline at end of file diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/login.html b/wagtail/wagtailadmin/templates/wagtailadmin/login.html index 42e4188ec..c975cd61a 100644 --- a/wagtail/wagtailadmin/templates/wagtailadmin/login.html +++ b/wagtail/wagtailadmin/templates/wagtailadmin/login.html @@ -43,7 +43,7 @@ {% if show_password_reset %} -
+ {% endif %} {% comment %} diff --git a/wagtail/wagtailadmin/tests/test_account_management.py b/wagtail/wagtailadmin/tests/test_account_management.py index c398e17cb..5337c9346 100644 --- a/wagtail/wagtailadmin/tests/test_account_management.py +++ b/wagtail/wagtailadmin/tests/test_account_management.py @@ -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) diff --git a/wagtail/wagtailadmin/urls.py b/wagtail/wagtailadmin/urls.py index 619533119..e2890cf33 100644 --- a/wagtail/wagtailadmin/urls.py +++ b/wagtail/wagtailadmin/urls.py @@ -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