X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/53e806828568c2b4b67125e8e82191e93c95a7d9..131d04d7a357f3d1c7f77f8f4931a96caee04d53:/src/catalogue/views.py diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 2ef0d3bf0..398c61cc4 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -5,7 +5,6 @@ from collections import OrderedDict import random from django.conf import settings -from django.http.response import HttpResponseForbidden from django.template.loader import render_to_string from django.shortcuts import get_object_or_404, render, redirect from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect @@ -18,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 @@ -28,7 +28,6 @@ from catalogue.helpers import get_top_level_related_tags from catalogue.models import Book, Collection, Tag, Fragment from catalogue.utils import split_tags from catalogue.models.tag import prefetch_relations -from wolnelektury.utils import is_crawler staff_required = user_passes_test(lambda user: user.is_staff) @@ -224,9 +223,6 @@ def tagged_object_list(request, tags, list_type): except ResponseInstead as e: return e.response - if is_crawler(request) and len(tags) > 1: - return HttpResponseForbidden('address removed from crawling. check robots.txt') - if list_type == 'gallery' and any(tag.category == 'set' for tag in tags): raise Http404 @@ -294,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, }) @@ -356,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)