X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/dd6284e01f00296294a527ded7e840ac14c5fbb8..27645bc61a8cb186116d6410217011dd755823f2:/apps/catalogue/models.py diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index e69d23168..e4cd8c40e 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -510,16 +510,12 @@ class Book(models.Model): tags = self.tags.filter(category__in=('author', 'kind', 'genre', 'epoch')) tags = split_tags(tags) - formats = [] + formats = {} # files generated during publication for ebook_format in self.ebook_formats: if self.has_media(ebook_format): - formats.append(u'%s' % ( - "", #self.get_media(ebook_format).url, - ebook_format.upper() - )) + formats[ebook_format] = self.get_media(ebook_format) - formats = [mark_safe(format) for format in formats] short_html = unicode(render_to_string('catalogue/book_short.html', {'book': self, 'tags': tags, 'formats': formats})) @@ -1035,7 +1031,7 @@ class Fragment(models.Model): verbose_name_plural = _('fragments') def get_absolute_url(self): - return '%s#m%s' % (self.book.get_html_url(), self.anchor) + return '%s#m%s' % (reverse('book_text', args=[self.book.slug]), self.anchor) def reset_short_html(self): if self.id is None: