X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/907aba88951334676a259dccc8f7edd8934d5e00..131d04d7a357f3d1c7f77f8f4931a96caee04d53:/src/catalogue/views.py?ds=sidebyside diff --git a/src/catalogue/views.py b/src/catalogue/views.py index ef2527b59..398c61cc4 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 @@ -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.all() if len(objects) > 3: best = random.sample(list(objects), 3)