X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0eedef1eafceaaa3f4f78b014236bf642be2807b..df60910b2d457f031cbe0a153e51e7378c0165d8:/src/catalogue/views.py?ds=sidebyside diff --git a/src/catalogue/views.py b/src/catalogue/views.py index e83b18ca4..037345bf1 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 @@ -312,7 +312,7 @@ def player(request, slug): if not book.has_media('mp3'): raise Http404 - audiobooks, projects = book.get_audiobooks() + audiobooks, projects, total_duration = book.get_audiobooks() return render( request, @@ -328,7 +328,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 +427,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)