X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/92c4a21dbc8fa9ff9c8d10127b7afffed5341b23..bf967b9c45fe221b88a251e2a754212bb175189e:/apps/catalogue/views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index f07f9abc4..2a826d95a 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -12,6 +12,7 @@ from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
 from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
+from django.views.decorators.cache import cache_page
 
 from catalogue import models
 from catalogue import forms
@@ -116,6 +117,9 @@ def tagged_object_list(request, tags=''):
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 
+    if not theme_is_set:
+        model=models.Book.objects.filter(parent=None)
+    
     return newtagging_views.tagged_object_list(
         request,
         tag_model=models.Tag,
@@ -137,9 +141,16 @@ def book_detail(request, slug):
         context_instance=RequestContext(request))
 
 
+@cache_page(60 * 60)
 def book_text(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
+    book_themes = {}
+    for fragment in book.fragments.all():
+        for theme in fragment.tags.filter(category='theme'):
+            book_themes.setdefault(theme, []).append(fragment)
     
+    book_themes = book_themes.items()
+    book_themes.sort(key=lambda s: s[0].sort_key)
     return render_to_response('catalogue/book_text.html', locals(),
         context_instance=RequestContext(request))