workaround problem witch search (collision with migdal)

diff --git a/src/search/urls.py b/src/search/urls.py
index 8aae74b..5a59422 100644 (file)
--- a/src/search/urls.py
+++ b/src/search/urls.py
@@ -6,6 +6,6 @@ from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     'search.views',
 
 urlpatterns = patterns(
     'search.views',

-    url(r'^$', 'main', name='search'),
+    url(r'^$', 'main', name='wlsearch'),

     url(r'^hint/$', 'hint', name='search_hint'),
 )
     url(r'^hint/$', 'hint', name='search_hint'),
 )

diff --git a/src/wolnelektury/templates/base/superbase.html b/src/wolnelektury/templates/base/superbase.html
index 749b6b5..3ff768f 100644 (file)
--- a/src/wolnelektury/templates/base/superbase.html
+++ b/src/wolnelektury/templates/base/superbase.html
@@ -125,7 +125,7 @@
                   </li>
                 </ul>
               </nav>
                   </li>
                 </ul>
               </nav>

-              <form id="search-area" action="{% url 'search' %}">
+              <form id="search-area" action="{% url 'wlsearch' %}">

                 <div id="search-field">
                   <label for="search">{{ search_form.q.label }}</label>
                   {{ search_form.q }}
                 <div id="search-field">
                   <label for="search">{{ search_form.q.label }}</label>
                   {{ search_form.q }}