From: Radek Czajka Date: Tue, 20 Mar 2012 10:33:54 +0000 (+0100) Subject: workaround for django ticket 17111; cover in api fix X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/87ff3f803d2f147e6fa939a99c4c4a4ca6aa965f?ds=sidebyside;hp=--cc workaround for django ticket 17111; cover in api fix --- 87ff3f803d2f147e6fa939a99c4c4a4ca6aa965f diff --git a/apps/api/handlers.py b/apps/api/handlers.py index b11a0a65f..98a57426c 100644 --- a/apps/api/handlers.py +++ b/apps/api/handlers.py @@ -134,7 +134,7 @@ class BookDetailHandler(BaseHandler, BookDetails): """ allowed_methods = ['GET'] fields = ['title', 'parent', 'children'] + Book.formats + [ - 'media', 'url'] + book_tag_categories + 'media', 'url', 'cover'] + book_tag_categories @piwik_track def read(self, request, book): diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py index 4c53da44e..da4a3aec3 100644 --- a/apps/catalogue/urls.py +++ b/apps/catalogue/urls.py @@ -15,11 +15,16 @@ urlpatterns = patterns('picture.views', 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}), +# 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'),