diff options
Diffstat (limited to 'chimere/urls.py')
| -rw-r--r-- | chimere/urls.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chimere/urls.py b/chimere/urls.py index 89c1070..208a1d3 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -24,7 +24,8 @@ from django.core.exceptions import ImproperlyConfigured admin.autodiscover() from chimere import views -from chimere.views import CategoryDirectoryView, CategoryView +from chimere.forms import SearchForm +from chimere.views import CategoryDirectoryView, CategoryView, SearchView from chimere.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \ LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID @@ -74,10 +75,8 @@ if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ views.route, name="route"), ] -if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \ - and settings.CHIMERE_SEARCH_ENGINE: - from chimere.forms import SearchForm - from chimere.views import SearchView + +if getattr(settings, 'HAYSTACK_SEARCH_ENGINE', None): from haystack.views import search_view_factory urlpatterns += [ url(r'^search/?$', search_view_factory( @@ -88,7 +87,9 @@ if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \ url(r'^search/autocomplete/$', views.autocomplete, name='autocomplete-search') ] - # urlpatterns += [url(r'^search/', include('haystack.urls')),] +else: + # TODO SEARCH + pass urlpatterns += [ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn/(?P<page_id>\w+)/$', |