catalogue style change

[wolnelektury.git] / apps / lesmianator / views.py

diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py
index cebcf8b..e86febe 100644 (file)
--- a/apps/lesmianator/views.py
+++ b/apps/lesmianator/views.py
@@ -8,17 +8,15 @@ from django.views.decorators import cache
 
 from catalogue.utils import get_random_hash
 from catalogue.models import Book, Tag
 
 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]
 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', 
     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))
 
 
                 context_instance=RequestContext(request))
 
 


@@ -35,11 +33,8 @@ def new_poem(request):
 
 
 @cache.never_cache
 
 
 @cache.never_cache

-def poem_from_book(request, book):
-    kwargs = Book.split_urlid(book)
-    if kwargs is None:
-        raise Http404
-    book = get_object_or_404(Book, **kwargs)
+def poem_from_book(request, slug):
+    book = get_object_or_404(Book, slug=slug)

     user = request.user if request.user.is_authenticated() else None
     text = Poem.write(Continuations.get(book))
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)
     user = request.user if request.user.is_authenticated() else None
     text = Poem.write(Continuations.get(book))
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)