X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/81f5e7445d649ead05b4d3d0a15b742444cd8b06..cb900d10b9d0d42b0b6aa035be45dcbaa2f61af6:/src/cover/views.py?ds=sidebyside diff --git a/src/cover/views.py b/src/cover/views.py index 638f1c06..d00123cc 100644 --- a/src/cover/views.py +++ b/src/cover/views.py @@ -22,7 +22,7 @@ from cover import forms from cover.utils import get_import_data -PREVIEW_SIZE = (216, 300) +PREVIEW_SIZE = (212, 300) def preview(request, book, chunk=None, rev=None): @@ -31,7 +31,14 @@ def preview(request, book, chunk=None, rev=None): If chunk and rev number are given, use version from given revision. If rev is not given, use publishable version. """ - chunk = Chunk.get(book, chunk) + try: + chunk = Chunk.get(book, chunk) + except Chunk.DoesNotExist: + raise Http404 + + if chunk.book.cover and rev is None and not request.GET.get('width') and not request.GET.get('height'): + return HttpResponseRedirect(chunk.book.cover.url) + if rev is not None: try: revision = chunk.at_revision(rev) @@ -158,7 +165,7 @@ def quick_import(request, pk): if url.startswith('%s://%s/' % ( request.scheme, request.get_host())): - cover_id = url.rsplit('/', 1)[-1] + cover_id = url.rstrip('/').rsplit('/', 1)[-1] cover = Image.objects.get(pk=cover_id) else: data = get_import_data(url)