fix

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

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index 9da3ebb..037345b 100644 (file)
--- 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 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
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea


@@ -294,7 +294,7 @@ def book_detail(request, slug):
     
     return render(
         request,
     
     return render(
         request,

-        'catalogue/2021/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
+        'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',

         {
             'book': book,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),
         {
             'book': book,
             'book_children': book.children.all().order_by('parent_number', 'sort_key'),


@@ -312,7 +312,7 @@ def player(request, slug):
     if not book.has_media('mp3'):
         raise Http404
 
     if not book.has_media('mp3'):
         raise Http404
 

-    audiobooks, projects = book.get_audiobooks()
+    audiobooks, projects, total_duration = book.get_audiobooks()

 
     return render(
         request,
 
     return render(
         request,


@@ -328,7 +328,7 @@ def player(request, slug):
 def book_text(request, slug):
     book = get_object_or_404(Book, slug=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():
         return HttpResponseRedirect(book.get_absolute_url())
 
     if not book.has_html_file():


@@ -427,7 +427,7 @@ class CustomPDFFormView(AjaxableFormView):
 
     def validate_object(self, obj, request):
         book = obj
 
     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)
 
             return HttpResponseRedirect(book.get_absolute_url())
         return super(CustomPDFFormView, self).validate_object(obj, request)