X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f0d9161da1b3fe4d3a528f95df30e26d221f73d4..0c502550a4f04aa016df8729af2ae2f85c0b495a:/src/catalogue/views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index fe4b2bfae..c63aa7a9e 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -19,7 +19,7 @@ from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
 from club.forms import ScheduleForm
-from club.models import Club, Membership
+from club.models import Club
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
@@ -142,9 +142,19 @@ 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_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_theme and new_layout.value:
+        template = 'catalogue/2022/theme_detail.html'
+    else:
+        template = 'catalogue/tagged_object_list.html'
+        
     return render(
-        request,
-        'catalogue/tagged_object_list.html', result,
+        request, template, result,
     )
 
 
@@ -328,7 +338,7 @@ def player(request, slug):
 def book_text(request, slug):
     book = get_object_or_404(Book, slug=slug)
 
-    if book.preview and not Membership.is_active_for(request.user):
+    if not book.is_accessible_to(request.user):
         return HttpResponseRedirect(book.get_absolute_url())
 
     if not book.has_html_file():
@@ -427,7 +437,7 @@ class CustomPDFFormView(AjaxableFormView):
 
     def validate_object(self, obj, request):
         book = obj
-        if book.preview and not Membership.is_active_for(request.user):
+        if not book.is_accessible_to(request.user):
             return HttpResponseRedirect(book.get_absolute_url())
         return super(CustomPDFFormView, self).validate_object(obj, request)