From e819de91b530edb00cc433fac93f195ce06aec06 Mon Sep 17 00:00:00 2001 From: hanpama Date: Fri, 7 Aug 2015 22:03:10 +0900 Subject: [PATCH] Fix URL names with namespace --- .../templates/wagtailforms/confirm_delete.html | 2 +- .../templates/wagtailforms/list_submissions.html | 4 ++-- wagtail/wagtailforms/tests.py | 8 ++++---- wagtail/wagtailforms/views.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html b/wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html index 6573b731b..b24f72bdc 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html +++ b/wagtail/wagtailforms/templates/wagtailforms/confirm_delete.html @@ -11,7 +11,7 @@

{% trans 'Are you sure you want to delete this form submission?' %}

-
+ {% csrf_token %}
diff --git a/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html index 804aa073d..075aa0749 100644 --- a/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html +++ b/wagtail/wagtailforms/templates/wagtailforms/list_submissions.html @@ -23,11 +23,11 @@ {% endfor %} + {% url 'wagtailforms:delete_submission' form_page.id row.model_id %}"> delete {% endfor %} - \ No newline at end of file + diff --git a/wagtail/wagtailforms/tests.py b/wagtail/wagtailforms/tests.py index d3c637251..cc96b5922 100644 --- a/wagtail/wagtailforms/tests.py +++ b/wagtail/wagtailforms/tests.py @@ -388,7 +388,7 @@ class TestDeleteFormSubmission(TestCase): def test_delete_submission_show_cofirmation(self): reponse = self.client.get(reverse( - 'wagtailforms_delete_submission', + 'wagtailforms:delete_submission', args=(self.form_page.id, FormSubmission.objects.first().id) ) ) @@ -400,7 +400,7 @@ class TestDeleteFormSubmission(TestCase): def test_delete_submission_with_permissions(self): response = self.client.post(reverse( - 'wagtailforms_delete_submission', + 'wagtailforms:delete_submission', args=(self.form_page.id, FormSubmission.objects.first().id) ) ) @@ -408,14 +408,14 @@ class TestDeleteFormSubmission(TestCase): # Check that the submission is gone self.assertEqual(FormSubmission.objects.count(), 1) # Should be redirected to list of submissions - self.assertRedirects(response, reverse("wagtailforms_list_submissions", args=(self.form_page.id, ))) + self.assertRedirects(response, reverse("wagtailforms:list_submissions", args=(self.form_page.id, ))) def test_delete_submission_bad_permissions(self): self.form_page = make_form_page() self.client.login(username="eventeditor", password="password") response = self.client.post(reverse( - 'wagtailforms_delete_submission', + 'wagtailforms:delete_submission', args=(self.form_page.id, FormSubmission.objects.first().id) ) ) diff --git a/wagtail/wagtailforms/views.py b/wagtail/wagtailforms/views.py index ef49a366f..70bcf209b 100644 --- a/wagtail/wagtailforms/views.py +++ b/wagtail/wagtailforms/views.py @@ -42,7 +42,7 @@ def delete_submission(request, page_id, submission_id): submission.delete() messages.success(request, _("Submission deleted.")) - return redirect('wagtailforms_list_submissions', page_id) + return redirect('wagtailforms:list_submissions', page_id) return render(request, 'wagtailforms/confirm_delete.html', { 'page': page,