From 40478e395acae2ae937c35048bd1637359328331 Mon Sep 17 00:00:00 2001
From: cornelius <cornelius@isl.co>
Date: Fri, 11 Dec 2015 09:59:14 -0500
Subject: [PATCH] Namespace the admin search urls

---
 .../templates/wagtailsearch/queries/chooser/chooser.html      | 2 +-
 .../templates/wagtailsearch/queries/chooser_field.js          | 2 +-
 wagtail/wagtailsearch/urls/admin.py                           | 4 ++--
 wagtail/wagtailsearch/wagtail_hooks.py                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
index 4859c8c1c..292abf36a 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser/chooser.html
@@ -3,7 +3,7 @@
 {% include "wagtailadmin/shared/header.html" with title=pop_str %}
 
 <div class="nice-padding">
-    <form class="query-search search-bar full-width" action="{% url 'wagtailsearch_queries_chooserresults' %}" method="GET" autocomplete="off">
+    <form class="query-search search-bar full-width" action="{% url 'wagtailsearch_admin:queries_chooserresults' %}" method="GET" autocomplete="off">
         <ul class="fields">
             {% for field in searchform %}
                 {% include "wagtailadmin/shared/field_as_li.html" with field=field %}
diff --git a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js
index 1966d4d87..a317a3b28 100644
--- a/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js
+++ b/wagtail/wagtailsearch/templates/wagtailsearch/queries/chooser_field.js
@@ -3,7 +3,7 @@ function createQueryChooser(id) {
     var input = $('#' + id);
 
     chooserElement.click(function() {
-        var initialUrl = '{% url "wagtailsearch_queries_chooser" %}';
+        var initialUrl = '{% url "wagtailsearch_admin:queries_chooser" %}';
 
         ModalWorkflow({
             url: initialUrl,
diff --git a/wagtail/wagtailsearch/urls/admin.py b/wagtail/wagtailsearch/urls/admin.py
index 4944d72be..0b151ced9 100644
--- a/wagtail/wagtailsearch/urls/admin.py
+++ b/wagtail/wagtailsearch/urls/admin.py
@@ -3,6 +3,6 @@ from wagtail.wagtailsearch.views import queries
 
 
 urlpatterns = [
-    url(r"^queries/chooser/$", queries.chooser, name="wagtailsearch_queries_chooser"),
-    url(r"^queries/chooser/results/$", queries.chooserresults, name="wagtailsearch_queries_chooserresults"),
+    url(r"^queries/chooser/$", queries.chooser, name="queries_chooser"),
+    url(r"^queries/chooser/results/$", queries.chooserresults, name="queries_chooserresults"),
 ]
diff --git a/wagtail/wagtailsearch/wagtail_hooks.py b/wagtail/wagtailsearch/wagtail_hooks.py
index f5c1544cc..b1a1ac628 100644
--- a/wagtail/wagtailsearch/wagtail_hooks.py
+++ b/wagtail/wagtailsearch/wagtail_hooks.py
@@ -7,5 +7,5 @@ from wagtail.wagtailsearch.urls import admin as admin_urls
 @hooks.register('register_admin_urls')
 def register_admin_urls():
     return [
-        url(r'^search/', include(admin_urls)),
+        url(r'^search/', include(admin_urls, namespace='wagtailsearch_admin')),
     ]