X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/67153f475c15e082ef89d3d4b475a83d59706e56..6e374f03fd5a0b9c7725f8268dd9c7d57d49ee89:/apps/lesmianator/views.py diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py index bb0a562fc..e86febe91 100644 --- a/apps/lesmianator/views.py +++ b/apps/lesmianator/views.py @@ -1,5 +1,6 @@ # Create your views here. +from django.http import Http404 from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.contrib.auth.decorators import login_required @@ -7,17 +8,15 @@ from django.views.decorators import cache from catalogue.utils import get_random_hash from catalogue.models import Book, Tag -from catalogue import forms from lesmianator.models import Poem, Continuations def main_page(request): last = Poem.objects.all().order_by('-created_at')[:10] - form = forms.SearchForm() shelves = Tag.objects.filter(user__username='lesmianator') return render_to_response('lesmianator/lesmianator.html', - {"last": last, "form": form, "shelves": shelves}, + {"last": last, "shelves": shelves}, context_instance=RequestContext(request)) @@ -66,8 +65,11 @@ def poem_from_set(request, shelf): def get_poem(request, poem): p = get_object_or_404(Poem, slug=poem) p.visit() - books = Book.objects.filter(id__in=p.get_created_from_value()) - book = books[0] if len(books) == 1 else None + if p.created_from: + books = Book.objects.filter(id__in=p.get_created_from_value()) + book = books[0] if len(books) == 1 else None + else: + books = book = None return render_to_response('lesmianator/poem.html', {"poem": p, "books": books, "book": book},