Fixes #10126

qgis · Feb 12, 2016 · 8338f9c · 8338f9c
1 parent e092206
commit 8338f9c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/qgis-app/plugins/search_indexes.py b/qgis-app/plugins/search_indexes.py
@@ -4,7 +4,7 @@
 
 
 class PluginIndex(indexes.SearchIndex, indexes.Indexable):
-    text = indexes.NgramField(document=True, use_template=True)
+    text = indexes.CharField(document=True, use_template=True)
     created_by = indexes.CharField(model_attr='created_by')
     created_on = indexes.DateTimeField(model_attr='created_on')
     # We add this for autocomplete.

diff --git a/qgis-app/templates/base.html b/qgis-app/templates/base.html
@@ -43,7 +43,7 @@
                     <a href="{% url "fe_login" %}"><i class="icon-signin icon-3x"></i></a>
                     {% endif %}
 
-                    <form class="navbar-search" action="/search/" method="get">
+                    <form class="navbar-search" action="{% url "haystack_search" %}" method="get">
                       <input type="text"  id="id_q" name="q" class="search-query" placeholder="Search" />
                     </form>
 

diff --git a/qgis-app/urls.py b/qgis-app/urls.py
@@ -31,8 +31,8 @@
     #(r'^bookmarks/', include('cab.urls.bookmarks')),
     #(r'^languages/', include('cab.urls.languages')),
     #(r'^popular/', include('cab.urls.popular')),
-    url(r'^search/', include('haystack.urls')),
     url(r'^search/', include('custom_haystack_urls')),
+    url(r'^search/', include('haystack.urls')),
 
     # SAM: qgis-users app
     url(r'^community-map/', include('users.urls')),