fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Search engine now should be db change change-proof
[wolnelektury.git]
/
apps
/
catalogue
/
urls.py
diff --git
a/apps/catalogue/urls.py
b/apps/catalogue/urls.py
index
4c53da4
..
da4a3ae
100644
(file)
--- a/
apps/catalogue/urls.py
+++ b/
apps/catalogue/urls.py
@@
-15,11
+15,16
@@
urlpatterns = patterns('picture.views',
url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
)
url(r'^obraz/(?P<picture>%s)/?$' % SLUG, 'picture_detail')
)
-urlpatterns += patterns('django.views.generic.simple',
- # old static pages - redirected
- url(r'^szukaj/$', 'redirect_to',
- {'url': '/szukaj/', 'query_string': True}),
+# 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'),
urlpatterns += patterns('catalogue.views',
url(r'^$', 'catalogue', name='catalogue'),