X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/e08b9a9ce539493a925abad05a1a2900aa80583e..29a0d33e9b44bfc99eedf000c8b60f6cff1815fa:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index fcbdf8bf..e1ef6aed 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- from datetime import datetime import os import logging @@ -212,17 +213,17 @@ def gallery(request, directory): smart_unicode(directory)) def map_to_url(filename): - return urllib.quote("%s/%s" % (base_url, smart_unicode(filename))) + return urllib.quote(("%s/%s" % (base_url, smart_unicode(filename))).encode('utf-8')) def is_image(filename): - return os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png') + return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png') images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() - book = Book.objects.get(gallery=directory) + books = Book.objects.filter(gallery=directory) - if not book.public and not request.user.is_authenticated(): + if not all(book.public for book in books) and not request.user.is_authenticated(): return HttpResponseForbidden("Not authorized.") return JSONResponse(images)