Merge branch 'performances' into 'master'

Improve performances on forum and SAS

See merge request ae/Sith!235

core/templates/core/macros.jinja

@@ -114,22 +114,24 @@
 {% endmacro %}
 
 {% macro paginate(page_obj, paginator) %}
+    {% if page_obj.has_previous() or page_obj.has_next() %}
         {% if page_obj.has_previous() %}
             <a href="?page={{ page_obj.previous_page_number() }}">{% trans %}Previous{% endtrans %}</a>
         {% else %}
             <span class="disabled">{% trans %}Previous{% endtrans %}</span>
         {% endif %}
-    {% for i in paginator.page_range %}
-        {% if page_obj.number == i %}
-            <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
+        {% for i in paginator.page_range %}
+            {% if page_obj.number == i %}
+                <span class="active">{{ i }} <span class="sr-only">({% trans %}current{% endtrans %})</span></span>
+            {% else %}
+                <a href="?page={{ i }}">{{ i }}</a>
+            {% endif %}
+        {% endfor %}
+        {% if page_obj.has_next() %}
+            <a href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
         {% else %}
-            <a href="?page={{ i }}">{{ i }}</a>
+            <span class="disabled">{% trans %}Next{% endtrans %}</span>
         {% endif %}
-    {% endfor %}
-    {% if page_obj.has_next() %}
-        <a href="?page={{ page_obj.next_page_number() }}">{% trans %}Next{% endtrans %}</a>
-    {% else %}
-        <span class="disabled">{% trans %}Next{% endtrans %}</span>
     {% endif %}
 {% endmacro %}
 

core/views/files.py

@@ -23,7 +23,7 @@
 #
 
 # This file contains all the views that concern the page model
-from django.shortcuts import redirect
+from django.shortcuts import redirect, get_object_or_404
 from django.views.generic import ListView, DetailView, TemplateView
 from django.views.generic.edit import UpdateView, FormMixin, DeleteView
 from django.views.generic.detail import SingleObjectMixin
@@ -51,9 +51,7 @@ def send_file(request, file_id, file_class=SithFile, file_attr="file"):
     memory at once. The FileWrapper will turn the file object into an
     iterator for chunks of 8KB.
     """
-    f = file_class.objects.filter(id=file_id).first()
-    if f is None or not f.file:
-        return not_found(request)
+    f = get_object_or_404(file_class, id=file_id)
     if not (
         can_view(f, request.user)
         or (

forum/views.py

@@ -280,7 +280,7 @@ class ForumTopicSubscribeView(CanViewMixin, SingleObjectMixin, RedirectView):
 
     def get(self, request, *args, **kwargs):
         self.object = self.get_object()
-        if request.user in self.object.subscribed_users.all():
+        if self.object.subscribed_users.filter(id=request.user.id).exists():
             self.object.subscribed_users.remove(request.user)
         else:
             self.object.subscribed_users.add(request.user)

sas/models.py

@@ -24,6 +24,7 @@
 
 from django.db import models
 from django.core.urlresolvers import reverse
+from django.core.cache import cache
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
@@ -71,16 +72,19 @@ class Picture(SithFile):
         return False
 
     def can_be_edited_by(self, user):
-        # file = SithFile.objects.filter(id=self.id).first()
-        return user.is_in_group(
-            settings.SITH_GROUP_SAS_ADMIN_ID
-        )  # or user.can_edit(file)
+        return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID)
 
     def can_be_viewed_by(self, user):
-        # file = SithFile.objects.filter(id=self.id).first()
-        return self.can_be_edited_by(user) or (
-            self.is_in_sas and self.is_moderated and user.was_subscribed
-        )  # or user.can_view(file)
+        # SAS pictures are visible to old subscribers
+        # Result is cached 4s for this user
+        if user.is_anonymous:
+            return False
+        perm = cache.get("%d_can_view_pictures" % (user.id), False)
+        if perm:
+            return perm
+        perm = self.is_in_sas and self.is_moderated and user.was_subscribed
+        cache.set("%d_can_view_pictures" % (user.id), perm, timeout=4)
+        return perm
 
     def get_download_url(self):
         return reverse("sas:download", kwargs={"picture_id": self.id})

sas/templates/sas/album.jinja

@@ -1,4 +1,5 @@
 {% extends "core/base.jinja" %}
+{% from "core/macros.jinja" import paginate %}
 
 {% block title %}
 {% trans %}SAS{% endtrans %}
@@ -62,7 +63,7 @@
         {% endfor %}
     </div>
     <div>
-        {% for p in album.children_pictures.order_by('id') %}
+        {% for p in pictures %}
         <div style="display: inline-block;">
         {% if edit_mode %}
         <input type="checkbox" name="file_list" value="{{ p.id }}">
@@ -77,6 +78,8 @@
         </div>
         {% endfor %}
     </div>
+    <br>
+    {{ paginate(pictures, paginator) }}
 {% if edit_mode %}
 </form>
 {% endif %}

sas/views.py

@@ -23,7 +23,7 @@
 #
 
 from django.shortcuts import redirect
-from django.http import HttpResponse
+from django.http import HttpResponse, Http404
 from django.core.urlresolvers import reverse_lazy, reverse
 from core.views.forms import SelectDate
 from django.views.generic import DetailView, TemplateView
@@ -32,6 +32,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 from django import forms
 from django.core.exceptions import PermissionDenied
+from django.core.paginator import Paginator, InvalidPage
 
 from ajax_select import make_ajax_field
 from ajax_select.fields import AutoCompleteSelectMultipleField
@@ -252,6 +253,14 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
     form_class = SASForm
     pk_url_kwarg = "album_id"
     template_name = "sas/album.jinja"
+    paginate_by = settings.SITH_SAS_IMAGES_PER_PAGE
+
+    def dispatch(self, request, *args, **kwargs):
+        try:
+            self.asked_page = int(request.GET.get("page", 1))
+        except ValueError:
+            raise Http404
+        return super(AlbumView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         self.form = self.get_form()
@@ -291,6 +300,13 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
 
     def get_context_data(self, **kwargs):
         kwargs = super(AlbumView, self).get_context_data(**kwargs)
+        kwargs["paginator"] = Paginator(
+            self.object.children_pictures.order_by("id"), self.paginate_by
+        )
+        try:
+            kwargs["pictures"] = kwargs["paginator"].page(self.asked_page)
+        except InvalidPage:
+            raise Http404
         kwargs["form"] = self.form
         kwargs["clipboard"] = SithFile.objects.filter(
             id__in=self.request.session["clipboard"]

sith/settings.py

@@ -338,6 +338,7 @@ SITH_FORUM_PAGE_LENGTH = 30
 
 # SAS variables
 SITH_SAS_ROOT_DIR_ID = 4
+SITH_SAS_IMAGES_PER_PAGE = 30
 
 SITH_BOARD_SUFFIX = "-bureau"
 SITH_MEMBER_SUFFIX = "-membres"