Merge branch 'master' of github.com:fnp/wolnelektury

[wolnelektury.git] / apps / catalogue / urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index c40c4ec..da4a3ae 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -10,11 +10,23 @@ from catalogue.views import CustomPDFFormView
 SLUG = r'[a-z0-9-]*'
 
 urlpatterns = patterns('picture.views',
-                       # pictures - currently pictures are coupled with catalogue, hence the url is here
-        url(r'^obraz/?$', 'picture_list'),
-        url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
-        ) + \
-    patterns('catalogue.views',
+    # pictures - currently pictures are coupled with catalogue, hence the url is here
+    url(r'^obraz/?$', 'picture_list'),
+    url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
+)
+
+# workaround for Django ticket #17111; redirect when resolved
+urlpatterns += patterns('search.views',
+    url(r'^szukaj/$', 'main'),  
+)
+#urlpatterns += patterns('django.views.generic.simple',
+#    # old search page - redirected
+#    url(r'^szukaj/$', 'redirect_to',
+#        
+#        {'url': '/szukaj/', 'query_string': True}),  
+#)
+
+urlpatterns += patterns('catalogue.views',
     url(r'^$', 'catalogue', name='catalogue'),
 
     url(r'^lektury/$', 'book_list', name='book_list'),
@@ -47,9 +59,3 @@ urlpatterns = patterns('picture.views',
     url(r'^custompdf/(?P<slug>%s).pdf' % SLUG, 'download_custom_pdf'),
 
 )
-
-urlpatterns += patterns('django.views.generic.simple',
-    # old static pages - redirected
-    url(r'^szukaj/$', 'redirect_to',
-        {'url': '/szukaj/'}),
-)