X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/907aba88951334676a259dccc8f7edd8934d5e00..16ca16378b89015b7762bfa27a042097844ce668:/src/catalogue/views.py

diff --git a/src/catalogue/views.py b/src/catalogue/views.py
index ef2527b59..904cdc531 100644
--- a/src/catalogue/views.py
+++ b/src/catalogue/views.py
@@ -17,7 +17,8 @@ from django.utils.translation import ugettext as _, ugettext_lazy
 from django.views.decorators.cache import never_cache
 
 from ajaxable.utils import AjaxableFormView
-from club.models import Membership
+from club.forms import ScheduleForm
+from club.models import Club, Membership
 from annoy.models import DynamicTextInsert
 from pdcounter import views as pdcounter_views
 from picture.models import Picture, PictureArea
@@ -35,7 +36,7 @@ def catalogue(request):
     return render(request, 'catalogue/catalogue.html', {
         'books': Book.objects.filter(findable=True, parent=None),
         'pictures': Picture.objects.all(),
-        'collections': Collection.objects.all(),
+        'collections': Collection.objects.filter(listed=True),
         'active_menu_item': 'all_works',
     })
 
@@ -289,6 +290,8 @@ def book_detail(request, slug):
             'book': book,
             '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,
         })
 
 
@@ -351,7 +354,7 @@ def import_book(request):
                 _("An error occurred: %(exception)s\n\n%(tb)s") % {
                     'exception': exception, 'tb': tb
                 },
-                mimetype='text/plain'
+                content_type='text/plain'
             )
         return HttpResponse(_("Book imported successfully"))
     return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
@@ -449,7 +452,7 @@ def tag_catalogue(request, category):
 
 
 def collections(request):
-    objects = Collection.objects.filter(role='')
+    objects = Collection.objects.filter(listed=True)
 
     if len(objects) > 3:
         best = random.sample(list(objects), 3)