From b7d5131321533374cdcb85542ef4dcb53269863d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20St=C4=99pniowski?= Date: Mon, 22 Jun 2009 21:05:27 +0200 Subject: [PATCH] =?utf8?q?Oznaczenie=20link=C3=B3w=20przekazywanych=20do?= =?utf8?q?=20book=5Fshort.html=20i=20fragment=5Fshort.html=20jako=20safe?= =?utf8?q?=5Fstring.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- apps/catalogue/models.py | 6 ++++-- wolnelektury/templates/catalogue/book_short.html | 4 ++-- wolnelektury/templates/catalogue/fragment_short.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 4dde4e0d8..58025fabd 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -119,7 +119,7 @@ class Book(models.Model): return mark_safe(self._short_html) else: tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book'))) - tags = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in tags] + tags = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) for tag in tags] formats = [] if self.html_file: @@ -135,6 +135,8 @@ class Book(models.Model): if self.ogg_file: formats.append(u'OGG' % self.ogg_file.url) + formats = [mark_safe(format) for format in formats] + self._short_html = unicode(render_to_string('catalogue/book_short.html', {'book': self, 'tags': tags, 'formats': formats})) self.save() @@ -312,7 +314,7 @@ class Fragment(models.Model): if len(self._short_html): return mark_safe(self._short_html) else: - book_authors = [u'%s' % (tag.get_absolute_url(), tag.name) + book_authors = [mark_safe(u'%s' % (tag.get_absolute_url(), tag.name)) for tag in self.book.tags if tag.category == 'author'] self._short_html = unicode(render_to_string('catalogue/fragment_short.html', diff --git a/wolnelektury/templates/catalogue/book_short.html b/wolnelektury/templates/catalogue/book_short.html index 41d3212f3..3012069f9 100644 --- a/wolnelektury/templates/catalogue/book_short.html +++ b/wolnelektury/templates/catalogue/book_short.html @@ -10,8 +10,8 @@

{{ book.title }}

{% if formats %} -

Na skróty: {{ formats|join:", "|safe }}

+

Na skróty: {{ formats|join:", " }}

{% endif %} -

Utwór w kategoriach: {{ tags|join:", "|safe }}

+

Utwór w kategoriach: {{ tags|join:", " }}

diff --git a/wolnelektury/templates/catalogue/fragment_short.html b/wolnelektury/templates/catalogue/fragment_short.html index 1afdebb53..aaab2bfd3 100644 --- a/wolnelektury/templates/catalogue/fragment_short.html +++ b/wolnelektury/templates/catalogue/fragment_short.html @@ -15,7 +15,7 @@ {% endif %}
-

{{ book.title }}, {{ book_authors|join:","|safe }} +

{{ book.title }}, {{ book_authors|join:"," }} (Zobacz w utworze)

-- 2.20.1