X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f88f26e37b7f97e31ff75742eecd21d7f3fe4f16..78c155d16f5e0a16288479a4259d972fd94e6a3f:/apps/catalogue/templatetags/catalogue_tags.py

diff --git a/apps/catalogue/templatetags/catalogue_tags.py b/apps/catalogue/templatetags/catalogue_tags.py
index e9b1610c8..78ce04ab5 100644
--- a/apps/catalogue/templatetags/catalogue_tags.py
+++ b/apps/catalogue/templatetags/catalogue_tags.py
@@ -45,10 +45,6 @@ def capfirst(text):
     except IndexError:
         return ''
 
-@register.filter
-def build_absolute_uri(uri, request):
-    return request.build_absolute_uri(uri)
-
 
 @register.simple_tag
 def html_title_from_tags(tags):
@@ -210,7 +206,6 @@ def authentication_form():
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
-    tag_name = bits[0]
 
     tags_to_add = []
     tags_to_remove = []
@@ -299,21 +294,17 @@ def book_info(book):
 
 @register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
 def book_wide(context, book):
-    theme_counter = book.theme_counter
-    book_themes = Tag.objects.filter(pk__in=theme_counter.keys())
-    for tag in book_themes:
-        tag.count = theme_counter[tag.pk]
-    extra_info = book.get_extra_info_value()
+    book_themes = book.related_themes()
+    extra_info = book.extra_info
     hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
 
     return {
         'book': book,
-        'main_link': reverse('book_text', args=[book.slug]),
+        'main_link': reverse('book_text', args=[book.slug]) if book.html_file else None,
         'related': book.related_info(),
-        'extra_info': book.get_extra_info_value(),
+        'extra_info': extra_info,
         'hide_about': hide_about,
         'themes': book_themes,
-        'custom_pdf_form': forms.CustomPDFForm(),
         'request': context.get('request'),
     }