search fix

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 816836d..b4e5920 100644 (file)
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -4,6 +4,7 @@
 from collections import OrderedDict
 import random
 import re
 from collections import OrderedDict
 import random
 import re

+from urllib.parse import quote_plus

 
 from django.conf import settings
 from django.template.loader import render_to_string
 
 from django.conf import settings
 from django.template.loader import render_to_string


@@ -12,13 +13,12 @@ from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpRespons
 from django.urls import reverse
 from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.urls import reverse
 from django.db.models import Q, QuerySet
 from django.contrib.auth.decorators import login_required, user_passes_test

-from django.utils.http import urlquote_plus

 from django.utils import translation
 from django.utils import translation

-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy

 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView

-from club.forms import ScheduleForm
+from club.forms import ScheduleForm, DonationStep1Form

 from club.models import Club
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from club.models import Club
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views


@@ -62,12 +62,18 @@ def book_list(request, filters=None, template_name='catalogue/book_list.html',
 
 
 def daisy_list(request):
 
 
 def daisy_list(request):

+    if request.EXPERIMENTS['layout'].value:
+        return object_list(request, Book.objects.filter(media__type='daisy'))

     return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
 
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)
     return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
 
 
 def collection(request, slug):
     coll = get_object_or_404(Collection, slug=slug)

-    return render(request, 'catalogue/collection.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/collection.html'
+    else:
+        template_name = 'catalogue/collection.html'
+    return render(request, template_name, {

         'collection': coll,
         'active_menu_item': 'collections',
     })
         'collection': coll,
         'active_menu_item': 'collections',
     })


@@ -103,6 +109,14 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
             Tag.objects.usage_for_queryset(
                 objects, counts=True
             ).exclude(category='set').exclude(pk__in=tag_ids))
             Tag.objects.usage_for_queryset(
                 objects, counts=True
             ).exclude(category='set').exclude(pk__in=tag_ids))

+        if request.user.is_authenticated:
+            related_tag_lists.append(
+                Tag.objects.usage_for_queryset(
+                    objects, counts=True
+                ).filter(
+                    user=request.user
+                ).exclude(name='').exclude(pk__in=tag_ids)
+            )

     if not (extra and extra.get('theme_is_set')):
         if fragments is None:
             if list_type == 'gallery':
     if not (extra and extra.get('theme_is_set')):
         if fragments is None:
             if list_type == 'gallery':


@@ -117,7 +131,11 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 
         if isinstance(objects, QuerySet):
             objects = prefetch_relations(objects, 'author')
 

+    

     categories = split_tags(*related_tag_lists)
     categories = split_tags(*related_tag_lists)

+    suggest = []
+    for c in ['set', 'author', 'epoch', 'kind', 'genre']:
+        suggest.extend(sorted(categories[c], key=lambda t: -t.count)[:3])

 
     objects = list(objects)
 
 
     objects = list(objects)
 


@@ -133,6 +151,7 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     result = {
         'object_list': objects,
         'categories': categories,
     result = {
         'object_list': objects,
         'categories': categories,

+        'suggest': suggest,

         'list_type': list_type,
         'tags': tags,
 
         'list_type': list_type,
         'tags': tags,
 


@@ -143,13 +162,14 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     if extra:
         result.update(extra)
 
     if extra:
         result.update(extra)
 

-    is_author = len(tags) == 1 and tags[0].category == 'author'

     is_theme = len(tags) == 1 and tags[0].category == 'theme'
     is_theme = len(tags) == 1 and tags[0].category == 'theme'

+    has_theme = any((x.category == 'theme' for x in tags))

     new_layout = request.EXPERIMENTS['layout']
     new_layout = request.EXPERIMENTS['layout']

-    if is_author and new_layout.value:
-        template = 'catalogue/2022/author_detail.html'
-    elif is_theme and new_layout.value:
+
+    if is_theme and new_layout.value:

         template = 'catalogue/2022/theme_detail.html'
         template = 'catalogue/2022/theme_detail.html'

+    elif new_layout.value and not has_theme:
+        template = 'catalogue/2022/author_detail.html'

     else:
         template = 'catalogue/tagged_object_list.html'
         
     else:
         template = 'catalogue/tagged_object_list.html'
         


@@ -279,9 +299,14 @@ def book_fragments(request, slug, theme_slug):
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 
     fragments = Fragment.tagged.with_all([theme]).filter(
         Q(book=book) | Q(book__ancestor=book))
 

+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/book_fragments.html'
+    else:
+        template_name = 'catalogue/book_fragments.html'
+    

     return render(
         request,
     return render(
         request,

-        'catalogue/book_fragments.html',
+        template_name,

         {
             'book': book,
             'theme': theme,
         {
             'book': book,
             'theme': theme,


@@ -298,19 +323,18 @@ def book_detail(request, slug):
         return pdcounter_views.book_stub_detail(request, slug)
 
     new_layout = request.EXPERIMENTS['layout']
         return pdcounter_views.book_stub_detail(request, slug)
 
     new_layout = request.EXPERIMENTS['layout']

-    # Not for preview books.
-    if new_layout.value and not book.is_accessible_to(request.user):
-        new_layout.override(None)

     
     return render(
         request,
         'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
         {
             'book': book,
     
     return render(
         request,
         'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
         {
             'book': book,

+            'accessible': book.is_accessible_to(request.user),

             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
             'club_form': ScheduleForm() if book.preview else None,
             'club': Club.objects.first() if book.preview else None,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
             'active_menu_item': 'books',
             'club_form': ScheduleForm() if book.preview else None,
             'club': Club.objects.first() if book.preview else None,

+            'donation_form': DonationStep1Form(),

 
             'EXPERIMENTS_SWITCHABLE_layout': True,
         })
 
             'EXPERIMENTS_SWITCHABLE_layout': True,
         })


@@ -416,13 +440,13 @@ def download_zip(request, file_format=None, media_format=None, slug=None):
         url = book.zip_audiobooks(media_format)
     else:
         raise Http404('No format specified for zip package')
         url = book.zip_audiobooks(media_format)
     else:
         raise Http404('No format specified for zip package')

-    return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+    return HttpResponseRedirect(quote_plus(settings.MEDIA_URL + url, safe='/?='))

 
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm
 
 
 class CustomPDFFormView(AjaxableFormView):
     form_class = forms.CustomPDFForm

-    title = ugettext_lazy('Download custom PDF')
-    submit = ugettext_lazy('Download')
+    title = gettext_lazy('Download custom PDF')
+    submit = gettext_lazy('Download')

     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 
     template = 'catalogue/custom_pdf_form.html'
     honeypot = True
 


@@ -463,7 +487,12 @@ def tag_catalogue(request, category):
     else:
         best = described_tags
 
     else:
         best = described_tags
 

-    return render(request, 'catalogue/tag_catalogue.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/tag_catalogue.html'
+    else:
+        template_name = 'catalogue/tag_catalogue.html'
+
+    return render(request, template_name, {

         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],
         'tags': tags,
         'best': best,
         'title': constants.CATEGORIES_NAME_PLURAL[category],


@@ -480,7 +509,12 @@ def collections(request):
     else:
         best = objects
 
     else:
         best = objects
 

-    return render(request, 'catalogue/collections.html', {
+    if request.EXPERIMENTS['layout'].value:
+        template_name = 'catalogue/2022/collections.html'
+    else:
+        template_name = 'catalogue/collections.html'
+
+    return render(request, template_name, {

         'objects': objects,
         'best': best,
         'active_menu_item': 'collections'
         'objects': objects,
         'best': best,
         'active_menu_item': 'collections'