fix

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 816836d..d1fc0c9 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 urllib.parse import quote_plus
 
 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.utils.http import urlquote_plus
 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 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
@@ -67,7 +67,11 @@ def daisy_list(request):
 
 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',
     })
@@ -144,10 +148,13 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None,
         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:
+        template = 'catalogue/2022/set_detail.html'
     elif is_theme and new_layout.value:
         template = 'catalogue/2022/theme_detail.html'
     else:
@@ -298,19 +305,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,
         })
@@ -416,13 +422,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')
-    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
-    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
 
@@ -480,7 +486,12 @@ def collections(request):
     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'