From: Jan Szejko Date: Mon, 28 Nov 2016 16:37:49 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/production' into production X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/e08b9a9ce539493a925abad05a1a2900aa80583e?hp=249d530e9478f9187092efbcc9d8a5b51ad033bb Merge remote-tracking branch 'origin/production' into production --- diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 34f02407..fcbdf8bf 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -220,7 +220,9 @@ def gallery(request, directory): images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() - if not request.user.is_authenticated(): + book = Book.objects.get(gallery=directory) + + if not book.public and not request.user.is_authenticated(): return HttpResponseForbidden("Not authorized.") return JSONResponse(images) diff --git a/lib/librarian b/lib/librarian index 7f5ff5c9..a7228ee6 160000 --- a/lib/librarian +++ b/lib/librarian @@ -1 +1 @@ -Subproject commit 7f5ff5c99803e281dc90364cd6efb77b8d91fa26 +Subproject commit a7228ee631d0902dd1d280ce4963954942621e60