Work list: don't care about types of objects on other pages.

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

diff --git a/apps/lesmianator/views.py b/apps/lesmianator/views.py
index e86febe..1ef4397 100644 (file)
--- a/apps/lesmianator/views.py
+++ b/apps/lesmianator/views.py
@@ -1,9 +1,9 @@
-# Create your views here.
-
-from django.http import Http404
+# -*- coding: utf-8 -*-
+# This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
 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.views.decorators import cache
 
 from catalogue.utils import get_random_hash
 from django.views.decorators import cache
 
 from catalogue.utils import get_random_hash


@@ -15,7 +15,7 @@ def main_page(request):
     last = Poem.objects.all().order_by('-created_at')[:10]
     shelves = Tag.objects.filter(user__username='lesmianator')
 
     last = Poem.objects.all().order_by('-created_at')[:10]
     shelves = Tag.objects.filter(user__username='lesmianator')
 

-    return render_to_response('lesmianator/lesmianator.html', 
+    return render_to_response('lesmianator/lesmianator.html',

                 {"last": last, "shelves": shelves},
                 context_instance=RequestContext(request))
 
                 {"last": last, "shelves": shelves},
                 context_instance=RequestContext(request))
 


@@ -27,7 +27,7 @@ def new_poem(request):
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)
     p.save()
 
     p = Poem(slug=get_random_hash(text), text=text, created_by=user)
     p.save()
 

-    return render_to_response('lesmianator/poem.html', 
+    return render_to_response('lesmianator/poem.html',

                 {"poem": p},
                 context_instance=RequestContext(request))
 
                 {"poem": p},
                 context_instance=RequestContext(request))
 


@@ -38,10 +38,10 @@ 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()
 
     p.save()
 

-    return render_to_response('lesmianator/poem.html', 
+    return render_to_response('lesmianator/poem.html',

                 {"poem": p, "books": [book], "book": book},
                 context_instance=RequestContext(request))
 
                 {"poem": p, "books": [book], "book": book},
                 context_instance=RequestContext(request))
 


@@ -53,12 +53,12 @@ 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
 

-    return render_to_response('lesmianator/poem.html', 
+    return render_to_response('lesmianator/poem.html',

                 {"poem": p, "shelf": tag, "books": books, "book": book},
                 context_instance=RequestContext(request))
 
                 {"poem": p, "shelf": tag, "books": books, "book": book},
                 context_instance=RequestContext(request))
 


@@ -66,12 +66,12 @@ def get_poem(request, poem):
     p = get_object_or_404(Poem, slug=poem)
     p.visit()
     if p.created_from:
     p = get_object_or_404(Poem, slug=poem)
     p.visit()
     if p.created_from:

-        books = Book.objects.filter(id__in=p.get_created_from_value())
+        books = Book.objects.filter(id__in=p.created_from)

         book = books[0] if len(books) == 1 else None
     else:
         books = book = None
 
         book = books[0] if len(books) == 1 else None
     else:
         books = book = None
 

-    return render_to_response('lesmianator/poem.html', 
+    return render_to_response('lesmianator/poem.html',

                 {"poem": p, "books": books, "book": book},
                 context_instance=RequestContext(request))
 
                 {"poem": p, "books": books, "book": book},
                 context_instance=RequestContext(request))