X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f9a071b288cec64a55000125a63b62a3b233c3fd..7784eab91b17a8c74cd79eb15303d09842b2d91c:/src/catalogue/views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 2955a5ce0..8c66af717 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -18,7 +18,7 @@ from django.utils.translation import gettext as _, gettext_lazy
 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
@@ -122,6 +122,10 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
             objects = prefetch_relations(objects, 'author')
 
     categories = split_tags(*related_tag_lists)
+    suggest = []
+    for c in ['author', 'epoch', 'kind', 'genre']:
+        if len(categories.get(c, [])) > 1:
+            suggest.extend(categories[c][:4])
 
     objects = list(objects)
 
@@ -137,6 +141,7 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     result = {
         'object_list': objects,
         'categories': categories,
+        'suggest': suggest,
         'list_type': list_type,
         'tags': tags,
 
@@ -147,16 +152,16 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
     if extra:
         result.update(extra)
 
-    is_author = len(tags) == 1 and tags[0].category == 'author'
     is_set = len(tags) == 1 and tags[0].category == 'set'
     is_theme = len(tags) == 1 and tags[0].category == 'theme'
     new_layout = request.EXPERIMENTS['layout']
-    if is_author and new_layout.value:
-        template = 'catalogue/2022/author_detail.html'
-    elif is_set and new_layout.value:
+
+    if is_set and new_layout.value:
         template = 'catalogue/2022/set_detail.html'
     elif is_theme and new_layout.value:
         template = 'catalogue/2022/theme_detail.html'
+    elif new_layout.value:
+        template = 'catalogue/2022/author_detail.html'
     else:
         template = 'catalogue/tagged_object_list.html'
         
@@ -305,19 +310,18 @@ def book_detail(request, slug):
         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,
+            '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,
+            'donation_form': DonationStep1Form(),
 
             'EXPERIMENTS_SWITCHABLE_layout': True,
         })