X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/743349c4413cfceb6f52a12e0a0790d9db346c98..b2bac01f6cb0d3153a2f4722dfbe1375f8584ba8:/apps/catalogue/urls.py diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index c40c4ec29..4c53da44e 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -10,11 +10,18 @@ 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%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%s)/?$' % SLUG, 'picture_detail') +) + +urlpatterns += patterns('django.views.generic.simple', + # old static pages - 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 +54,3 @@ urlpatterns = patterns('picture.views', url(r'^custompdf/(?P%s).pdf' % SLUG, 'download_custom_pdf'), ) - -urlpatterns += patterns('django.views.generic.simple', - # old static pages - redirected - url(r'^szukaj/$', 'redirect_to', - {'url': '/szukaj/'}), -)