X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/1c8de9a0fa5d7adb8dc595e1935704da088ee2dd..f94960707e13dc99bc497ac68427de6834d311fd:/apps/wiki/views.py?ds=sidebyside diff --git a/apps/wiki/views.py b/apps/wiki/views.py index f9594261..f8ba46ec 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,6 +1,7 @@ from datetime import datetime import os import logging +from time import mktime import urllib from django.conf import settings @@ -52,8 +53,8 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html' access_time = datetime.now() last_books = request.session.get("wiki_last_books", {}) - last_books[slug, chunk.slug] = { - 'time': access_time, + last_books[reverse(editor, args=[chunk.book.slug, chunk.slug])] = { + 'time': mktime(access_time.timetuple()), 'title': chunk.pretty_name(), } @@ -87,7 +88,7 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta access_time = datetime.now() last_books = request.session.get("wiki_last_books", {}) last_books[slug, chunk.slug] = { - 'time': access_time, + 'time': mktime(access_time.timetuple()), 'title': chunk.book.title, } @@ -219,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(): + books = Book.objects.filter(gallery=directory) + + if not all(book.public for book in books) and not request.user.is_authenticated(): return HttpResponseForbidden("Not authorized.") return JSONResponse(images)