From a1e641215d5255a42a7dfb7d3fd0e6f254e034cb Mon Sep 17 00:00:00 2001 From: Karl Hobley Date: Tue, 8 Jul 2014 10:51:00 +0100 Subject: [PATCH] Allow search frontend urls to be imported from wagtailsearch.urls When editors picks is merged, I plan to move 'wagtailsearch.frontend.urls' to 'wagtailsearch.urls' This commit adds forwards-compatibility for this change --- wagtail/tests/urls.py | 4 ++-- wagtail/wagtailsearch/urls/__init__.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wagtail/tests/urls.py b/wagtail/tests/urls.py index 385d0e6cf..c9ca98bba 100644 --- a/wagtail/tests/urls.py +++ b/wagtail/tests/urls.py @@ -3,13 +3,13 @@ from django.conf.urls import patterns, include, url from wagtail.wagtailcore import urls as wagtail_urls from wagtail.wagtailadmin import urls as wagtailadmin_urls from wagtail.wagtaildocs import urls as wagtaildocs_urls -from wagtail.wagtailsearch.urls import frontend as wagtailsearch_frontend_urls +from wagtail.wagtailsearch import urls as wagtailsearch_urls from wagtail.contrib.wagtailsitemaps.views import sitemap urlpatterns = patterns('', url(r'^admin/', include(wagtailadmin_urls)), - url(r'^search/', include(wagtailsearch_frontend_urls)), + url(r'^search/', include(wagtailsearch_urls)), url(r'^documents/', include(wagtaildocs_urls)), url(r'^sitemap\.xml$', sitemap), diff --git a/wagtail/wagtailsearch/urls/__init__.py b/wagtail/wagtailsearch/urls/__init__.py index e69de29bb..faba126e7 100644 --- a/wagtail/wagtailsearch/urls/__init__.py +++ b/wagtail/wagtailsearch/urls/__init__.py @@ -0,0 +1 @@ +from wagtail.wagtailsearch.urls.frontend import urlpatterns