fix

[wolnelektury.git] / src / picture / views.py

diff --git a/src/picture/views.py b/src/picture/views.py
index e742c15..35f0f3d 100644 (file)
--- a/src/picture/views.py
+++ b/src/picture/views.py
@@ -1,23 +1,39 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #

+from collections import Counter

 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render
 from picture.models import Picture
 from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.shortcuts import render, get_object_or_404, render
 from picture.models import Picture

+from catalogue.models import Tag

 from catalogue.utils import split_tags
 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax
 from catalogue.utils import split_tags
 from sponsors.models import Sponsor
 from wolnelektury.utils import ajax

+from catalogue.helpers import get_top_level_related_tags

 
 
 
 

-def picture_list_thumb(request, filter=None, get_filter=None, template_name='picture/picture_list_thumb.html',
-                       cache_key=None, context=None):
+def picture_list_thumb(request):

     pictures = Picture.objects.all()
     pictures = Picture.objects.all()

-    if filter:
-        pictures = pictures.filter(filter)
-    if get_filter:
-        pictures = pictures.filter(get_filter())
-    return render(request, template_name, {'picture_list': list(pictures)})
+        
+    related_tags = Tag.objects.usage_for_model(Picture, counts=True)
+    related_tags = sorted(related_tags, key=lambda t: -t.count)
+    suggestion_categories = Counter()
+    suggestions = []
+    for t in related_tags:
+        if suggestion_categories[t.category] < 3:
+            suggestion_categories[t.category] += 1
+            suggestions.append(t)
+            if sum(suggestion_categories.values()) == 10:
+                break
+    template_name = 'catalogue/2022/author_detail.html'
+    return render(request, template_name, {
+        'object_list': pictures,
+        'title': 'Galeria',
+        'tags': [],
+        'suggest': suggestions,
+        'list_type': 'gallery',
+    })

 
 
 def picture_detail(request, slug):
 
 
 def picture_detail(request, slug):


@@ -25,10 +41,7 @@ def picture_detail(request, slug):
 
     theme_things = split_tags(picture.related_themes())
 
 
     theme_things = split_tags(picture.related_themes())
 

-    if request.EXPERIMENTS['layout'].value:
-        template_name = 'picture/2022/picture_detail.html'
-    else:
-        template_name = 'picture/picture_detail.html'
+    template_name = 'picture/2022/picture_detail.html'

     
     return render(request, template_name, {
         'picture': picture,
     
     return render(request, template_name, {
         'picture': picture,