From 735082e927fde90b748cc7b2f3725fdfae5fc6cb Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 23 Oct 2015 11:41:28 +0100 Subject: [PATCH] use URL namespace for wagtailsettings --- wagtail/contrib/settings/forms.py | 2 +- wagtail/contrib/settings/registry.py | 2 +- .../settings/templates/wagtailsettings/edit.html | 2 +- wagtail/contrib/settings/tests/test_admin.py | 16 ++++++++-------- wagtail/contrib/settings/urls.py | 4 ++-- wagtail/contrib/settings/views.py | 4 ++-- wagtail/contrib/settings/wagtail_hooks.py | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/wagtail/contrib/settings/forms.py b/wagtail/contrib/settings/forms.py index d28cc6c4d1..c44c1123d4 100644 --- a/wagtail/contrib/settings/forms.py +++ b/wagtail/contrib/settings/forms.py @@ -23,5 +23,5 @@ class SiteSwitchForm(forms.Form): @classmethod def get_change_url(cls, site, model): - return reverse('wagtailsettings_edit', args=[ + return reverse('wagtailsettings:edit', args=[ site.pk, model._meta.app_label, model._meta.model_name]) diff --git a/wagtail/contrib/settings/registry.py b/wagtail/contrib/settings/registry.py index a460de0345..de09b6a2a9 100644 --- a/wagtail/contrib/settings/registry.py +++ b/wagtail/contrib/settings/registry.py @@ -20,7 +20,7 @@ class SettingMenuItem(MenuItem): self.model = model super(SettingMenuItem, self).__init__( label=capfirst(model._meta.verbose_name), - url=reverse('wagtailsettings_edit', args=[ + url=reverse('wagtailsettings:edit', args=[ model._meta.app_label, model._meta.model_name]), classnames=classnames, **kwargs) diff --git a/wagtail/contrib/settings/templates/wagtailsettings/edit.html b/wagtail/contrib/settings/templates/wagtailsettings/edit.html index 574b16efa0..a6165fba86 100644 --- a/wagtail/contrib/settings/templates/wagtailsettings/edit.html +++ b/wagtail/contrib/settings/templates/wagtailsettings/edit.html @@ -26,7 +26,7 @@ -
+ {% csrf_token %} {{ edit_handler.render_form_content }} diff --git a/wagtail/contrib/settings/tests/test_admin.py b/wagtail/contrib/settings/tests/test_admin.py index 099ba8ee68..9ef7b6fd50 100644 --- a/wagtail/contrib/settings/tests/test_admin.py +++ b/wagtail/contrib/settings/tests/test_admin.py @@ -29,14 +29,14 @@ class TestSettingMenu(TestCase, WagtailTestUtils): response = self.client.get(reverse('wagtailadmin_home')) self.assertContains(response, capfirst(TestSetting._meta.verbose_name)) - self.assertContains(response, reverse('wagtailsettings_edit', args=('tests', 'testsetting'))) + self.assertContains(response, reverse('wagtailsettings:edit', args=('tests', 'testsetting'))) def test_menu_item_no_permissions(self): self.login_only_admin() response = self.client.get(reverse('wagtailadmin_home')) self.assertNotContains(response, TestSetting._meta.verbose_name) - self.assertNotContains(response, reverse('wagtailsettings_edit', args=('tests', 'testsetting'))) + self.assertNotContains(response, reverse('wagtailsettings:edit', args=('tests', 'testsetting'))) def test_menu_item_icon(self): menu_item = SettingMenuItem(IconSetting, icon='tag', classnames='test-class') @@ -54,7 +54,7 @@ class BaseTestSettingView(TestCase, WagtailTestUtils): return self.client.post(url, post_data) def edit_url(self, app, model, site_pk=1): - return reverse('wagtailsettings_edit', args=[site_pk, app, model]) + return reverse('wagtailsettings:edit', args=[site_pk, app, model]) class TestSettingCreateView(BaseTestSettingView): @@ -125,9 +125,9 @@ class TestMultiSite(BaseTestSettingView): """ Should redirect to the setting for the default site. """ - start_url = reverse('wagtailsettings_edit', args=[ + start_url = reverse('wagtailsettings:edit', args=[ 'tests', 'testsetting']) - dest_url = 'http://testserver' + reverse('wagtailsettings_edit', args=[ + dest_url = 'http://testserver' + reverse('wagtailsettings:edit', args=[ self.default_site.pk, 'tests', 'testsetting']) response = self.client.get(start_url, follow=True) self.assertEqual([(dest_url, 302)], response.redirect_chain) @@ -137,9 +137,9 @@ class TestMultiSite(BaseTestSettingView): Should redirect to the setting for the current site taken from the URL, by default """ - start_url = reverse('wagtailsettings_edit', args=[ + start_url = reverse('wagtailsettings:edit', args=[ 'tests', 'testsetting']) - dest_url = 'http://example.com' + reverse('wagtailsettings_edit', args=[ + dest_url = 'http://example.com' + reverse('wagtailsettings:edit', args=[ self.other_site.pk, 'tests', 'testsetting']) response = self.client.get(start_url, follow=True, HTTP_HOST=self.other_site.hostname) self.assertEqual([(dest_url, 302)], response.redirect_chain) @@ -151,7 +151,7 @@ class TestMultiSite(BaseTestSettingView): self.default_site.is_default_site = False self.default_site.save() - start_url = reverse('wagtailsettings_edit', args=[ + start_url = reverse('wagtailsettings:edit', args=[ 'tests', 'testsetting']) response = self.client.get(start_url, follow=True, HTTP_HOST="noneoftheabove.example.com") self.assertEqual(302, response.redirect_chain[0][1]) diff --git a/wagtail/contrib/settings/urls.py b/wagtail/contrib/settings/urls.py index 767c717f07..555627c1de 100644 --- a/wagtail/contrib/settings/urls.py +++ b/wagtail/contrib/settings/urls.py @@ -3,6 +3,6 @@ from django.conf.urls import url from . import views urlpatterns = [ - url(r'^(\w+)/(\w+)/$', views.edit_current_site, name='wagtailsettings_edit'), - url(r'^(\d+)/(\w+)/(\w+)/$', views.edit, name='wagtailsettings_edit'), + url(r'^(\w+)/(\w+)/$', views.edit_current_site, name='edit'), + url(r'^(\d+)/(\w+)/(\w+)/$', views.edit, name='edit'), ] diff --git a/wagtail/contrib/settings/views.py b/wagtail/contrib/settings/views.py index 0f7f50e1db..784a12707d 100644 --- a/wagtail/contrib/settings/views.py +++ b/wagtail/contrib/settings/views.py @@ -36,7 +36,7 @@ def edit_current_site(request, app_name, model_name): # Redirect the user to the edit page for the current site # (or the current request does not correspond to a site, the first site in the list) site = request.site or Site.objects.first() - return redirect('wagtailsettings_edit', site.pk, app_name, model_name) + return redirect('wagtailsettings:edit', site.pk, app_name, model_name) def edit(request, site_pk, app_name, model_name): @@ -64,7 +64,7 @@ def edit(request, site_pk, app_name, model_name): instance=instance ) ) - return redirect('wagtailsettings_edit', site.pk, app_name, model_name) + return redirect('wagtailsettings:edit', site.pk, app_name, model_name) else: messages.error(request, _("The setting could not be saved due to errors.")) edit_handler = edit_handler_class(instance=instance, form=form) diff --git a/wagtail/contrib/settings/wagtail_hooks.py b/wagtail/contrib/settings/wagtail_hooks.py index 2aa954df11..ef750b3c52 100644 --- a/wagtail/contrib/settings/wagtail_hooks.py +++ b/wagtail/contrib/settings/wagtail_hooks.py @@ -8,5 +8,5 @@ from . import urls @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^settings/', include(urls)), + url(r'^settings/', include(urls, namespace='wagtailsettings')), ]