diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index 208a1d3..e7d1a97 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -81,15 +81,17 @@ if getattr(settings, 'HAYSTACK_SEARCH_ENGINE', None): urlpatterns += [ url(r'^search/?$', search_view_factory( view_class=SearchView, - template='search/search.html', + template='search/search_haystack.html', form_class=SearchForm - ), name='haystack_search'), + ), name='search'), url(r'^search/autocomplete/$', views.autocomplete, name='autocomplete-search') ] else: - # TODO SEARCH - pass + urlpatterns += [ + url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]+)/)?search/?$', + views.SearchView.as_view(), name='search'), + ] urlpatterns += [ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn/(?P<page_id>\w+)/$', |