From 441314a19b845f0c1bba4360c08434b3db69367d Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Fri, 10 Jul 2015 12:58:21 +0100 Subject: [PATCH] Removed type name from edit URL names Was previously, edit_image, edit_document, etc. Now just "edit" --- wagtail/wagtaildocs/admin_urls.py | 2 +- .../templates/wagtaildocs/documents/edit.html | 2 +- .../templates/wagtaildocs/documents/list.html | 2 +- .../wagtaildocs/widgets/document_chooser.html | 2 +- wagtail/wagtaildocs/tests.py | 14 +++++++------- wagtail/wagtaildocs/views/chooser.py | 2 +- wagtail/wagtaildocs/views/documents.py | 4 ++-- wagtail/wagtailimages/admin_urls.py | 2 +- .../templates/wagtailimages/images/edit.html | 2 +- .../templates/wagtailimages/images/results.html | 2 +- .../wagtailimages/widgets/image_chooser.html | 2 +- wagtail/wagtailimages/tests/test_admin_views.py | 4 ++-- wagtail/wagtailimages/tests/test_models.py | 2 +- wagtail/wagtailimages/views/chooser.py | 4 ++-- wagtail/wagtailimages/views/images.py | 4 ++-- .../templates/wagtailredirects/edit.html | 2 +- .../templates/wagtailredirects/list.html | 2 +- wagtail/wagtailredirects/tests.py | 4 ++-- wagtail/wagtailredirects/urls.py | 2 +- wagtail/wagtailredirects/views.py | 4 ++-- 20 files changed, 32 insertions(+), 32 deletions(-) diff --git a/wagtail/wagtaildocs/admin_urls.py b/wagtail/wagtaildocs/admin_urls.py index dd0acb7b4..1ad1c14d4 100644 --- a/wagtail/wagtaildocs/admin_urls.py +++ b/wagtail/wagtaildocs/admin_urls.py @@ -5,7 +5,7 @@ from wagtail.wagtaildocs.views import documents, chooser urlpatterns = [ url(r'^$', documents.index, name='index'), url(r'^add/$', documents.add, name='add'), - url(r'^edit/(\d+)/$', documents.edit, name='edit_document'), + url(r'^edit/(\d+)/$', documents.edit, name='edit'), url(r'^delete/(\d+)/$', documents.delete, name='delete_document'), url(r'^chooser/$', chooser.chooser, name='chooser'), diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html index 51a99622c..cf58d2ad4 100644 --- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html +++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/edit.html @@ -18,7 +18,7 @@
-
+ {% csrf_token %}
    {% for field in form %} diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html index 13e93a629..bac1cc08f 100644 --- a/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html +++ b/wagtail/wagtaildocs/templates/wagtaildocs/documents/list.html @@ -33,7 +33,7 @@ {% if choosing %}

    {{ doc.title }}

    {% else %} -

    {{ doc.title }}

    +

    {{ doc.title }}

    {% endif %} {{ doc.filename }} diff --git a/wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html b/wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html index 4783efb20..78df5b689 100644 --- a/wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html +++ b/wagtail/wagtaildocs/templates/wagtaildocs/widgets/document_chooser.html @@ -5,4 +5,4 @@ {{ document.title }} {% endblock %} -{% block edit_chosen_item_url %}{% if document %}{% url 'wagtaildocs:edit_document' document.id %}{% endif %}{% endblock %} +{% block edit_chosen_item_url %}{% if document %}{% url 'wagtaildocs:edit' document.id %}{% endif %}{% endblock %} diff --git a/wagtail/wagtaildocs/tests.py b/wagtail/wagtaildocs/tests.py index f1edcd206..60c852fc0 100644 --- a/wagtail/wagtaildocs/tests.py +++ b/wagtail/wagtaildocs/tests.py @@ -159,7 +159,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): self.document = models.Document.objects.create(title="Test document", file=fake_file) def test_simple(self): - response = self.client.get(reverse('wagtaildocs:edit_document', args=(self.document.id,))) + response = self.client.get(reverse('wagtaildocs:edit', args=(self.document.id,))) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html') @@ -173,7 +173,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): 'title': "Test document changed!", 'file': fake_file, } - response = self.client.post(reverse('wagtaildocs:edit_document', args=(self.document.id,)), post_data) + response = self.client.post(reverse('wagtaildocs:edit', args=(self.document.id,)), post_data) # User should be redirected back to the index self.assertRedirects(response, reverse('wagtaildocs:index')) @@ -190,7 +190,7 @@ class TestDocumentEditView(TestCase, WagtailTestUtils): document = models.Document.objects.create(title="Test missing source document", file=fake_file) document.file.delete(False) - response = self.client.get(reverse('wagtaildocs:edit_document', args=(document.id,)), {}) + response = self.client.get(reverse('wagtaildocs:edit', args=(document.id,)), {}) self.assertEqual(response.status_code, 200) self.assertTemplateUsed(response, 'wagtaildocs/documents/edit.html') @@ -372,7 +372,7 @@ class TestUsageCount(TestCase, WagtailTestUtils): event_page_related_link.page = page event_page_related_link.link_document = doc event_page_related_link.save() - response = self.client.get(reverse('wagtaildocs:edit_document', + response = self.client.get(reverse('wagtaildocs:edit', args=(1,))) self.assertNotContains(response, 'Used 1 time') @@ -384,13 +384,13 @@ class TestUsageCount(TestCase, WagtailTestUtils): event_page_related_link.page = page event_page_related_link.link_document = doc event_page_related_link.save() - response = self.client.get(reverse('wagtaildocs:edit_document', + response = self.client.get(reverse('wagtaildocs:edit', args=(1,))) self.assertContains(response, 'Used 1 time') @override_settings(WAGTAIL_USAGE_COUNT_ENABLED=True) def test_usage_count_zero_appears(self): - response = self.client.get(reverse('wagtaildocs:edit_document', + response = self.client.get(reverse('wagtaildocs:edit', args=(1,))) self.assertContains(response, 'Used 0 times') @@ -498,7 +498,7 @@ class TestIssue613(TestCase, WagtailTestUtils): 'file': another_fake_file, } post_data.update(params) - response = self.client.post(reverse('wagtaildocs:edit_document', args=(document.id,)), post_data) + response = self.client.post(reverse('wagtaildocs:edit', args=(document.id,)), post_data) # User should be redirected back to the index self.assertRedirects(response, reverse('wagtaildocs:index')) diff --git a/wagtail/wagtaildocs/views/chooser.py b/wagtail/wagtaildocs/views/chooser.py index 60bac8a83..91b31fa6a 100644 --- a/wagtail/wagtaildocs/views/chooser.py +++ b/wagtail/wagtaildocs/views/chooser.py @@ -21,7 +21,7 @@ def get_document_json(document): return json.dumps({ 'id': document.id, 'title': document.title, - 'edit_link': reverse('wagtaildocs:edit_document', args=(document.id,)), + 'edit_link': reverse('wagtaildocs:edit', args=(document.id,)), }) diff --git a/wagtail/wagtaildocs/views/documents.py b/wagtail/wagtaildocs/views/documents.py index 762793c99..88cb71005 100644 --- a/wagtail/wagtaildocs/views/documents.py +++ b/wagtail/wagtaildocs/views/documents.py @@ -90,7 +90,7 @@ def add(request): backend.add(doc) messages.success(request, _("Document '{0}' added.").format(doc.title), buttons=[ - messages.button(reverse('wagtaildocs:edit_document', args=(doc.id,)), _('Edit')) + messages.button(reverse('wagtaildocs:edit', args=(doc.id,)), _('Edit')) ]) return redirect('wagtaildocs:index') else: @@ -125,7 +125,7 @@ def edit(request, document_id): backend.add(doc) messages.success(request, _("Document '{0}' updated").format(doc.title), buttons=[ - messages.button(reverse('wagtaildocs:edit_document', args=(doc.id,)), _('Edit')) + messages.button(reverse('wagtaildocs:edit', args=(doc.id,)), _('Edit')) ]) return redirect('wagtaildocs:index') else: diff --git a/wagtail/wagtailimages/admin_urls.py b/wagtail/wagtailimages/admin_urls.py index 7e60ade54..283641151 100644 --- a/wagtail/wagtailimages/admin_urls.py +++ b/wagtail/wagtailimages/admin_urls.py @@ -5,7 +5,7 @@ from wagtail.wagtailimages.views import images, chooser, multiple urlpatterns = [ url(r'^$', images.index, name='index'), - url(r'^(\d+)/$', images.edit, name='edit_image'), + url(r'^(\d+)/$', images.edit, name='edit'), url(r'^(\d+)/delete/$', images.delete, name='delete_image'), url(r'^(\d+)/generate_url/$', images.url_generator, name='url_generator'), url(r'^(\d+)/generate_url/(.*)/$', images.generate_url, name='generate_url'), diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html index 56b3f5c7b..577943a6f 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/images/edit.html +++ b/wagtail/wagtailimages/templates/wagtailimages/images/edit.html @@ -28,7 +28,7 @@
    - + {% csrf_token %}
      {% for field in form %} diff --git a/wagtail/wagtailimages/templates/wagtailimages/images/results.html b/wagtail/wagtailimages/templates/wagtailimages/images/results.html index 59cade724..405d3bd33 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/images/results.html +++ b/wagtail/wagtailimages/templates/wagtailimages/images/results.html @@ -16,7 +16,7 @@
        {% for image in images %}
      • - +
        {% image image max-165x165 class="show-transparency" %}

        {{ image.title|ellipsistrim:60 }}

         diff --git a/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html b/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html index 5ea2ccc73..fee541998 100644 --- a/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html +++ b/wagtail/wagtailimages/templates/wagtailimages/widgets/image_chooser.html @@ -13,4 +13,4 @@
    {% endblock %} -{% block edit_chosen_item_url %}{% if image %}{% url 'wagtailimages:edit_image' image.id %}{% endif %}{% endblock %} +{% block edit_chosen_item_url %}{% if image %}{% url 'wagtailimages:edit' image.id %}{% endif %}{% endblock %} diff --git a/wagtail/wagtailimages/tests/test_admin_views.py b/wagtail/wagtailimages/tests/test_admin_views.py index bca28993c..78f3040a3 100644 --- a/wagtail/wagtailimages/tests/test_admin_views.py +++ b/wagtail/wagtailimages/tests/test_admin_views.py @@ -132,10 +132,10 @@ class TestImageEditView(TestCase, WagtailTestUtils): ) def get(self, params={}): - return self.client.get(reverse('wagtailimages:edit_image', args=(self.image.id,)), params) + return self.client.get(reverse('wagtailimages:edit', args=(self.image.id,)), params) def post(self, post_data={}): - return self.client.post(reverse('wagtailimages:edit_image', args=(self.image.id,)), post_data) + return self.client.post(reverse('wagtailimages:edit', args=(self.image.id,)), post_data) def test_simple(self): response = self.get() diff --git a/wagtail/wagtailimages/tests/test_models.py b/wagtail/wagtailimages/tests/test_models.py index c8c67df2e..63f614bdd 100644 --- a/wagtail/wagtailimages/tests/test_models.py +++ b/wagtail/wagtailimages/tests/test_models.py @@ -335,7 +335,7 @@ class TestIssue613(TestCase, WagtailTestUtils): 'title': "Edited", } post_data.update(params) - response = self.client.post(reverse('wagtailimages:edit_image', args=(self.image.id,)), post_data) + response = self.client.post(reverse('wagtailimages:edit', args=(self.image.id,)), post_data) # Should redirect back to index self.assertRedirects(response, reverse('wagtailimages:index')) diff --git a/wagtail/wagtailimages/views/chooser.py b/wagtail/wagtailimages/views/chooser.py index 7a3cc490a..b96efdb84 100644 --- a/wagtail/wagtailimages/views/chooser.py +++ b/wagtail/wagtailimages/views/chooser.py @@ -23,7 +23,7 @@ def get_image_json(image): return json.dumps({ 'id': image.id, - 'edit_link': reverse('wagtailimages:edit_image', args=(image.id,)), + 'edit_link': reverse('wagtailimages:edit', args=(image.id,)), 'title': image.title, 'preview': { 'url': preview_image.url, @@ -166,7 +166,7 @@ def chooser_select_format(request, image_id): 'format': format.name, 'alt': form.cleaned_data['alt_text'], 'class': format.classnames, - 'edit_link': reverse('wagtailimages:edit_image', args=(image.id,)), + 'edit_link': reverse('wagtailimages:edit', args=(image.id,)), 'preview': { 'url': preview_image.url, 'width': preview_image.width, diff --git a/wagtail/wagtailimages/views/images.py b/wagtail/wagtailimages/views/images.py index b44c2aad0..2ae9285de 100644 --- a/wagtail/wagtailimages/views/images.py +++ b/wagtail/wagtailimages/views/images.py @@ -108,7 +108,7 @@ def edit(request, image_id): backend.add(image) messages.success(request, _("Image '{0}' updated.").format(image.title), buttons=[ - messages.button(reverse('wagtailimages:edit_image', args=(image.id,)), _('Edit again')) + messages.button(reverse('wagtailimages:edit', args=(image.id,)), _('Edit again')) ]) return redirect('wagtailimages:index') else: @@ -252,7 +252,7 @@ def add(request): backend.add(image) messages.success(request, _("Image '{0}' added.").format(image.title), buttons=[ - messages.button(reverse('wagtailimages:edit_image', args=(image.id,)), _('Edit')) + messages.button(reverse('wagtailimages:edit', args=(image.id,)), _('Edit')) ]) return redirect('wagtailimages:index') else: diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html index e38a6d4d6..c6b57ef7f 100644 --- a/wagtail/wagtailredirects/templates/wagtailredirects/edit.html +++ b/wagtail/wagtailredirects/templates/wagtailredirects/edit.html @@ -6,7 +6,7 @@ {% trans "Editing" as editing_str %} {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=redirect.title icon="redirect" %} - + {% csrf_token %} {{ edit_handler.render_form_content }} diff --git a/wagtail/wagtailredirects/templates/wagtailredirects/list.html b/wagtail/wagtailredirects/templates/wagtailredirects/list.html index c8f0afcf7..3621b9a34 100644 --- a/wagtail/wagtailredirects/templates/wagtailredirects/list.html +++ b/wagtail/wagtailredirects/templates/wagtailredirects/list.html @@ -22,7 +22,7 @@ {% for redirect in redirects %} -

    {{ redirect.title }}

    +

    {{ redirect.title }}

    {% if redirect.redirect_page %} diff --git a/wagtail/wagtailredirects/tests.py b/wagtail/wagtailredirects/tests.py index 2346b1fce..6f48e1a8e 100644 --- a/wagtail/wagtailredirects/tests.py +++ b/wagtail/wagtailredirects/tests.py @@ -141,10 +141,10 @@ class TestRedirectsEditView(TestCase, WagtailTestUtils): self.login() def get(self, params={}, redirect_id=None): - return self.client.get(reverse('wagtailredirects:edit_redirect', args=(redirect_id or self.redirect.id, )), params) + return self.client.get(reverse('wagtailredirects:edit', args=(redirect_id or self.redirect.id, )), params) def post(self, post_data={}, redirect_id=None): - return self.client.post(reverse('wagtailredirects:edit_redirect', args=(redirect_id or self.redirect.id, )), post_data) + return self.client.post(reverse('wagtailredirects:edit', args=(redirect_id or self.redirect.id, )), post_data) def test_simple(self): response = self.get() diff --git a/wagtail/wagtailredirects/urls.py b/wagtail/wagtailredirects/urls.py index 8bfd83a18..53e987c24 100644 --- a/wagtail/wagtailredirects/urls.py +++ b/wagtail/wagtailredirects/urls.py @@ -5,6 +5,6 @@ from wagtail.wagtailredirects import views urlpatterns = [ url(r'^$', views.index, name='index'), url(r'^add/$', views.add, name='add'), - url(r'^(\d+)/$', views.edit, name='edit_redirect'), + url(r'^(\d+)/$', views.edit, name='edit'), url(r'^(\d+)/delete/$', views.delete, name='delete_redirect'), ] diff --git a/wagtail/wagtailredirects/views.py b/wagtail/wagtailredirects/views.py index 927db483d..9f787a5fe 100644 --- a/wagtail/wagtailredirects/views.py +++ b/wagtail/wagtailredirects/views.py @@ -70,7 +70,7 @@ def edit(request, redirect_id): if form.is_valid(): form.save() messages.success(request, _("Redirect '{0}' updated.").format(theredirect.title), buttons=[ - messages.button(reverse('wagtailredirects:edit_redirect', args=(theredirect.id,)), _('Edit')) + messages.button(reverse('wagtailredirects:edit', args=(theredirect.id,)), _('Edit')) ]) return redirect('wagtailredirects:index') else: @@ -113,7 +113,7 @@ def add(request): theredirect.save() messages.success(request, _("Redirect '{0}' added.").format(theredirect.title), buttons=[ - messages.button(reverse('wagtailredirects:edit_redirect', args=(theredirect.id,)), _('Edit')) + messages.button(reverse('wagtailredirects:edit', args=(theredirect.id,)), _('Edit')) ]) return redirect('wagtailredirects:index') else: