librarian update

[wolnelektury.git] / src / wolnelektury / views.py

diff --git a/src/wolnelektury/views.py b/src/wolnelektury/views.py
index 49f7b24..265f766 100644 (file)
--- a/src/wolnelektury/views.py
+++ b/src/wolnelektury/views.py
@@ -21,24 +21,27 @@ from ajaxable.utils import placeholdized
 from catalogue.models import Book, Collection, Tag, Fragment
 from ssify import ssi_included
 
 from catalogue.models import Book, Collection, Tag, Fragment
 from ssify import ssi_included
 

+from social.utils import get_or_choose_cite
+

 
 def main_page(request):
     ctx = {
         'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6],
 
 def main_page(request):
     ctx = {
         'last_published': Book.objects.exclude(cover_thumb='').filter(parent=None).order_by('-created_at')[:6],

+        'theme_books': [],
+        'cite': get_or_choose_cite(request),

     }
 
     }
 

-    for category in ('author', 'epoch', 'genre', 'kind'):
-        try:
-            ctx[category] = Tag.objects.filter(category=category).order_by('?')[:1][0]
-        except IndexError:
-            pass
+    # for category in ('author', 'epoch', 'genre', 'kind'):
+    #     try:
+    #         ctx[category] = Tag.objects.filter(category=category).order_by('?')[:1][0]
+    #     except IndexError:
+    #         pass

 
     # FIXME: find this theme and books properly.
 
     # FIXME: find this theme and books properly.

-    ctx['theme_books'] = []
-    if Fragment.objects.count():
+    if Fragment.objects.exists():

         while True:
             ctx['theme'] = Tag.objects.filter(category='theme').order_by('?')[:1][0]
         while True:
             ctx['theme'] = Tag.objects.filter(category='theme').order_by('?')[:1][0]

-            tf = Fragment.tagged.with_any([ctx['theme']]).order_by('?')[:100]
+            tf = Fragment.tagged.with_any([ctx['theme']]).select_related('book').order_by('?')[:100]

             if not tf:
                 continue
             ctx['theme_fragment'] = tf[0]
             if not tf:
                 continue
             ctx['theme_fragment'] = tf[0]