X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6e3e08e5354baaf82f7d46cbd88883e4c7426dce..ef03d00cada0de76d1e97aa362237923243bb71e:/src/catalogue/templatetags/catalogue_tags.py?ds=sidebyside
diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index 6906f605d..263f12cfa 100644
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -11,6 +11,7 @@ from django import template
from django.template import Node, Variable, Template, Context
from django.core.urlresolvers import reverse
from django.utils.cache import add_never_cache_headers
+from django.utils.safestring import mark_safe
from django.utils.translation import ugettext as _
from ssify import ssi_variable
@@ -18,7 +19,7 @@ from ssify import ssi_variable
from catalogue.helpers import get_audiobook_tags
from catalogue.models import Book, BookMedia, Fragment, Tag, Source
from catalogue.constants import LICENSES
-from catalogue.utils import is_subscribed
+from paypal.rest import user_is_subscribed
from picture.models import Picture
register = template.Library()
@@ -57,7 +58,7 @@ def simple_title(tags):
@register.simple_tag
def book_title(book, html_links=False):
- return book.pretty_title(html_links)
+ return mark_safe(book.pretty_title(html_links))
@register.simple_tag
@@ -136,7 +137,7 @@ def book_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "
%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@@ -149,14 +150,14 @@ def audiobook_tree(book_list, books_by_parent):
) for book in book_list)
if text:
- return "%s
" % text
+ return mark_safe("%s
" % text)
else:
return ''
@register.simple_tag
def book_tree_texml(book_list, books_by_parent, depth=1):
- return "".join("""
+ return mark_safe("".join("""
%(depth)dem%(title)s
%(audiences)s
%(audiobook)s
@@ -168,7 +169,7 @@ def book_tree_texml(book_list, books_by_parent, depth=1):
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_texml(books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -181,7 +182,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
except ValueError:
return s
- return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
+ return mark_safe("".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
@@ -192,7 +193,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
"audiences": ", ".join(book.audiences_pl()),
"audiobook": "audiobook" if book.has_media('mp3') else "",
"children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
- } for book in book_list)
+ } for book in book_list))
@register.simple_tag
@@ -415,7 +416,7 @@ def download_audio(book, daisy=True, mp3=True):
if daisy and book.has_media('daisy'):
for dsy in book.get_media('daisy'):
links.append("%s" % (dsy.file.url, BookMedia.formats['daisy'].name))
- return "".join(links)
+ return mark_safe("".join(links))
@register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")
@@ -498,7 +499,7 @@ def strip_tag(html, tag_name):
def status(book, user):
if not book.preview:
return 'open'
- elif is_subscribed(user):
+ elif user_is_subscribed(user):
return 'preview'
else:
return 'closed'