X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/592c9401b18118e01de250d44878b9289b138f9c..a9226097c8eea0591fd3249f62a71becc6d2be93:/src/picture/views.py diff --git a/src/picture/views.py b/src/picture/views.py index e40e0ab41..6bf513d76 100644 --- a/src/picture/views.py +++ b/src/picture/views.py @@ -1,23 +1,42 @@ # 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 catalogue.models import Tag 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() - if filter: - pictures = pictures.filter(filter) - if get_filter: - pictures = pictures.filter(get_filter()) - return render(request, template_name, {'picture_list': list(pictures)}) + + if request.EXPERIMENTS['layout'].value: + 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', + }) + else: + return render(request, template_name, {'picture_list': list(pictures)}) def picture_detail(request, slug): @@ -25,7 +44,12 @@ def picture_detail(request, slug): theme_things = split_tags(picture.related_themes()) - return render(request, "picture/picture_detail.html", { + if request.EXPERIMENTS['layout'].value: + template_name = 'picture/2022/picture_detail.html' + else: + template_name = 'picture/picture_detail.html' + + return render(request, template_name, { 'picture': picture, 'themes': theme_things.get('theme', []), 'things': theme_things.get('thing', []), @@ -81,7 +105,7 @@ def import_picture(request): """docstring for import_book""" from django.http import HttpResponse from picture.forms import PictureImportForm - from django.utils.translation import ugettext as _ + from django.utils.translation import gettext as _ import_form = PictureImportForm(request.POST, request.FILES) if import_form.is_valid():