diff --git a/wagtail/contrib/settings/wagtail_hooks.py b/wagtail/contrib/settings/wagtail_hooks.py index ef750b3c52..6ed8ab549b 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, namespace='wagtailsettings')), + url(r'^settings/', include(urls, app_name='wagtailsettings', namespace='wagtailsettings')), ] diff --git a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py index b71b59a8f1..4dd4f1e08e 100644 --- a/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py +++ b/wagtail/contrib/wagtailsearchpromotions/wagtail_hooks.py @@ -12,7 +12,7 @@ from wagtail.wagtailadmin.menu import MenuItem @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^searchpicks/', include(admin_urls, namespace='wagtailsearchpromotions')), + url(r'^searchpicks/', include(admin_urls, app_name='wagtailsearchpromotions', namespace='wagtailsearchpromotions')), ] diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/wagtailadmin/urls/__init__.py index 349a53fa1d..2ee1905103 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/wagtailadmin/urls/__init__.py @@ -20,7 +20,7 @@ urlpatterns = [ url(r'^pages/$', pages.index, name='wagtailadmin_explore_root'), url(r'^pages/(\d+)/$', pages.index, name='wagtailadmin_explore'), - url(r'^pages/', include(wagtailadmin_pages_urls, namespace='wagtailadmin_pages')), + url(r'^pages/', include(wagtailadmin_pages_urls, app_name='wagtailadmin_pages', namespace='wagtailadmin_pages')), # TODO: Move into wagtailadmin_pages namespace url(r'^choose-page/$', chooser.browse, name='wagtailadmin_choose_page'), diff --git a/wagtail/wagtaildocs/wagtail_hooks.py b/wagtail/wagtaildocs/wagtail_hooks.py index 61e6fd393c..19d7b2fb4d 100644 --- a/wagtail/wagtaildocs/wagtail_hooks.py +++ b/wagtail/wagtaildocs/wagtail_hooks.py @@ -17,7 +17,7 @@ from wagtail.wagtaildocs.rich_text import DocumentLinkHandler @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^documents/', include(admin_urls, namespace='wagtaildocs')), + url(r'^documents/', include(admin_urls, app_name='wagtaildocs', namespace='wagtaildocs')), ] diff --git a/wagtail/wagtailembeds/wagtail_hooks.py b/wagtail/wagtailembeds/wagtail_hooks.py index e8a3f9385a..e389bafe92 100644 --- a/wagtail/wagtailembeds/wagtail_hooks.py +++ b/wagtail/wagtailembeds/wagtail_hooks.py @@ -11,7 +11,7 @@ from wagtail.wagtailembeds.rich_text import MediaEmbedHandler @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^embeds/', include(urls, namespace='wagtailembeds')), + url(r'^embeds/', include(urls, app_name='wagtailembeds', namespace='wagtailembeds')), ] diff --git a/wagtail/wagtailforms/wagtail_hooks.py b/wagtail/wagtailforms/wagtail_hooks.py index 14474eebdd..b7c75c8433 100644 --- a/wagtail/wagtailforms/wagtail_hooks.py +++ b/wagtail/wagtailforms/wagtail_hooks.py @@ -12,7 +12,7 @@ from wagtail.wagtailforms.models import get_forms_for_user @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^forms/', include(urls, namespace='wagtailforms')), + url(r'^forms/', include(urls, app_name='wagtailforms', namespace='wagtailforms')), ] diff --git a/wagtail/wagtailredirects/wagtail_hooks.py b/wagtail/wagtailredirects/wagtail_hooks.py index f8d21cebf4..f3694761d5 100644 --- a/wagtail/wagtailredirects/wagtail_hooks.py +++ b/wagtail/wagtailredirects/wagtail_hooks.py @@ -12,7 +12,7 @@ from wagtail.wagtailadmin.menu import MenuItem @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^redirects/', include(urls, namespace='wagtailredirects')), + url(r'^redirects/', include(urls, app_name='wagtailredirects', namespace='wagtailredirects')), ] diff --git a/wagtail/wagtailsites/wagtail_hooks.py b/wagtail/wagtailsites/wagtail_hooks.py index d1c0efdedf..3479665b27 100644 --- a/wagtail/wagtailsites/wagtail_hooks.py +++ b/wagtail/wagtailsites/wagtail_hooks.py @@ -12,7 +12,7 @@ from wagtail.wagtailsites import urls @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^sites/', include(urls, namespace='wagtailsites')), + url(r'^sites/', include(urls, app_name='wagtailsites', namespace='wagtailsites')), ] diff --git a/wagtail/wagtailsnippets/wagtail_hooks.py b/wagtail/wagtailsnippets/wagtail_hooks.py index 675678bf44..12a1cbe5b1 100644 --- a/wagtail/wagtailsnippets/wagtail_hooks.py +++ b/wagtail/wagtailsnippets/wagtail_hooks.py @@ -16,7 +16,7 @@ from wagtail.wagtailsnippets.models import get_snippet_content_types @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^snippets/', include(urls, namespace='wagtailsnippets')), + url(r'^snippets/', include(urls, app_name='wagtailsnippets', namespace='wagtailsnippets')), ] diff --git a/wagtail/wagtailusers/wagtail_hooks.py b/wagtail/wagtailusers/wagtail_hooks.py index b2358b356b..2bc58328ef 100644 --- a/wagtail/wagtailusers/wagtail_hooks.py +++ b/wagtail/wagtailusers/wagtail_hooks.py @@ -14,8 +14,8 @@ from wagtail.wagtailusers.urls import users, groups @hooks.register('register_admin_urls') def register_admin_urls(): return [ - url(r'^users/', include(users, namespace='wagtailusers_users')), - url(r'^groups/', include(groups, namespace='wagtailusers_groups')), + url(r'^users/', include(users, app_name='wagtailusers_users', namespace='wagtailusers_users')), + url(r'^groups/', include(groups, app_name='wagtailusers_groups', namespace='wagtailusers_groups')), ]