From 4741f83333c5384cd5fc697012c591f01a0d4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Wed, 9 May 2018 18:44:01 +0200 Subject: [PATCH] Fix document usage url on the edit page --- .../templates/wagtaildocs/documents/edit.html | 2 +- wagtail/documents/tests/test_admin_views.py | 11 ++++++++++- wagtail/images/tests/test_admin_views.py | 4 +++- wagtail/snippets/tests.py | 6 ++++-- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/wagtail/documents/templates/wagtaildocs/documents/edit.html b/wagtail/documents/templates/wagtaildocs/documents/edit.html index 9384a7272..9cd15780e 100644 --- a/wagtail/documents/templates/wagtaildocs/documents/edit.html +++ b/wagtail/documents/templates/wagtaildocs/documents/edit.html @@ -55,7 +55,7 @@ {% if uc_enabled %}
{% trans "Usage" %}
- {% blocktrans count usage_count=document.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %} + {% blocktrans count usage_count=document.get_usage.count %}Used {{ usage_count }} time{% plural %}Used {{ usage_count }} times{% endblocktrans %}
{% endif %} diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py index 651b5d2df..97a39bdb7 100644 --- a/wagtail/documents/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -271,6 +271,14 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): self.assertContains(response, 'File not found') + @override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True) + def test_usage_link(self): + response = self.client.get(reverse('wagtaildocs:edit', args=(self.document.id,))) + self.assertEqual(response.status_code, 200) + self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html') + self.assertContains(response, self.document.usage_url) + self.assertContains(response, 'Used 0 times') + class TestDocumentDeleteView(TestCase, WagtailTestUtils): def setUp(self): @@ -299,7 +307,8 @@ class TestDocumentDeleteView(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtaildocs:delete', args=(self.document.id,))) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtaildocs/documents/confirm_delete.html') - self.assertIn('Used 0 times', str(response.content)) + self.assertContains(response, self.document.usage_url) + self.assertContains(response, 'Used 0 times') class TestMultipleDocumentUploader(TestCase, WagtailTestUtils): diff --git a/wagtail/images/tests/test_admin_views.py b/wagtail/images/tests/test_admin_views.py index 4cc3d7ace..37a8e3f1b 100644 --- a/wagtail/images/tests/test_admin_views.py +++ b/wagtail/images/tests/test_admin_views.py @@ -491,7 +491,9 @@ class TestImageDeleteView(TestCase, WagtailTestUtils): response = self.get() self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtailimages/images/confirm_delete.html') - self.assertIn('Used 0 times', str(response.content)) + self.assertContains(response, 'Used 0 times') + expected_url = '/admin/images/usage/%d/' % self.image.id + self.assertContains(response, expected_url) def test_delete(self): response = self.post() diff --git a/wagtail/snippets/tests.py b/wagtail/snippets/tests.py index c469ca032..f15c05c82 100644 --- a/wagtail/snippets/tests.py +++ b/wagtail/snippets/tests.py @@ -362,7 +362,8 @@ class TestSnippetDelete(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailsnippets:delete', args=('tests', 'advert', quote(self.test_snippet.pk), ))) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtailsnippets/snippets/confirm_delete.html') - self.assertIn('Used 2 times', str(response.content)) + self.assertContains(response, 'Used 2 times') + self.assertContains(response, self.test_snippet.usage_url()) class TestSnippetChooserPanel(TestCase, WagtailTestUtils): @@ -877,7 +878,8 @@ class TestSnippetViewWithCustomPrimaryKey(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailsnippets:delete', args=('snippetstests', 'standardsnippetwithcustomprimarykey', quote(self.snippet_a.pk), ))) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtailsnippets/snippets/confirm_delete.html') - self.assertIn('Used 0 times', str(response.content)) + self.assertContains(response, 'Used 0 times') + self.assertContains(response, self.snippet_a.usage_url()) class TestSnippetChooserBlockWithCustomPrimaryKey(TestCase):