Merge branch 'production'

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

diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py
index bb0a562..7b289b7 100644 (file)
--- a/apps/lesmianator/views.py
+++ b/apps/lesmianator/views.py
@@ -1,5 +1,6 @@
 # Create your views here.
 
 # 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
 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.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))
 
 


@@ -39,7 +38,7 @@ def poem_from_book(request, 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)

-    p.set_created_from_value([book.id])
+    p.created_from = [book.id]

     p.save()
 
     return render_to_response('lesmianator/poem.html', 
     p.save()
 
     return render_to_response('lesmianator/poem.html', 


@@ -54,7 +53,7 @@ def poem_from_set(request, shelf):
     text = Poem.write(Continuations.get(tag))
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)
     books = Book.tagged.with_any((tag,))
     text = Poem.write(Continuations.get(tag))
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)
     books = Book.tagged.with_any((tag,))

-    p.set_created_from_value([b.id for b in books])
+    p.created_from = [b.id for b in books]

     p.save()
 
     book = books[0] if len(books) == 1 else None
     p.save()
 
     book = books[0] if len(books) == 1 else None


@@ -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()
 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.created_from)
+        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},
 
     return render_to_response('lesmianator/poem.html', 
                 {"poem": p, "books": books, "book": book},