X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/4fae06ea1b9fec1a45482ac043aa049ebce3f465..14a909d8568d3ce83bd7204a156203dd4c303507:/src/wiki/views.py?ds=sidebyside

diff --git a/src/wiki/views.py b/src/wiki/views.py
index cf67abbd..29c389a7 100644
--- a/src/wiki/views.py
+++ b/src/wiki/views.py
@@ -7,6 +7,7 @@ import logging
 from time import mktime
 from urllib.parse import quote
 
+from django.apps import apps
 from django.conf import settings
 from django.urls import reverse
 from django import http
@@ -17,6 +18,7 @@ from django.utils.formats import localize
 from django.utils.translation import gettext as _
 from django.views.decorators.http import require_POST, require_GET
 from django.shortcuts import get_object_or_404, render
+from sorl.thumbnail import get_thumbnail
 
 from documents.models import Book, Chunk
 from . import nice_diff
@@ -230,14 +232,18 @@ def gallery(request, directory):
         def is_image(filename):
             return os.path.splitext(filename)[1].lower() in (u'.jpg', u'.jpeg', u'.png')
 
-        images = [map_to_url(f) for f in os.listdir(base_dir) if is_image(f)]
-        images.sort()
-
         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.")
 
+        images = [
+            {
+                "url": map_to_url(f),
+                "thumb": get_thumbnail(os.path.join(base_dir, f), '120x120').url
+            } for f in sorted(os.listdir(base_dir)) if is_image(f)
+        ]
+
         return JSONResponse(images)
     except (IndexError, OSError):
         logger.exception("Unable to fetch gallery")
@@ -275,6 +281,8 @@ def revision(request, chunk_id):
     doc = get_object_or_404(Chunk, pk=chunk_id)
     if not doc.book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
+    Presence = apps.get_model('team', 'Presence')
+    Presence.report(request.user, doc, request.GET.get('a') == 'true')
     return http.HttpResponse(str(doc.revision()))
 
 
@@ -285,8 +293,15 @@ def history(request, chunk_id):
     if not doc.book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 
+    history = doc.history()
+    try:
+        before = int(request.GET.get('before'))
+    except:
+        pass
+    else:
+        history = history.filter(revision__lt=before)
     changes = []
-    for change in doc.history().reverse():
+    for change in history.reverse()[:20]:
         changes.append({
                 "version": change.revision,
                 "description": change.description,