fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update tests
[wolnelektury.git]
/
apps
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/apps/catalogue/templatetags/catalogue_tags.py
b/apps/catalogue/templatetags/catalogue_tags.py
index
61b3846
..
e5e4d4f
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-45,10
+45,6
@@
def capfirst(text):
except IndexError:
return ''
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):
@register.simple_tag
def html_title_from_tags(tags):
@@
-299,10
+295,7
@@
def book_info(book):
@register.inclusion_tag('catalogue/book_wide.html', takes_context=True)
def book_wide(context, 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]
+ book_themes = book.related_themes()
extra_info = book.get_extra_info_value()
hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
extra_info = book.get_extra_info_value()
hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
@@
-313,7
+306,6
@@
def book_wide(context, book):
'extra_info': book.get_extra_info_value(),
'hide_about': hide_about,
'themes': book_themes,
'extra_info': book.get_extra_info_value(),
'hide_about': hide_about,
'themes': book_themes,
- 'custom_pdf_form': forms.CustomPDFForm(),
'request': context.get('request'),
}
'request': context.get('request'),
}