X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/c7c8dfb7ad2240ffc0135dbd9dd871c85f211a29..26bab478d964d772fd40831a9f31c305ebbd4c90:/apps/catalogue/models.py?ds=inline diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index feccaedf4..db194347e 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -38,8 +38,9 @@ class Tag(TagBase): sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True) category = models.CharField(_('category'), max_length=50, blank=False, null=False, db_index=True, choices=TAG_CATEGORIES) - description = models.TextField(blank=True) - + description = models.TextField(_('description'), blank=True) + main_page = models.BooleanField(_('main page'), default=False, db_index=True, help_text=_('Show tag on main page')) + user = models.ForeignKey(User, blank=True, null=True) def has_description(self): @@ -102,8 +103,8 @@ class Book(models.Model): if self.odt_file: formats.append(u'Plik ODT' % self.odt_file.url) - self._short_html = render_to_string('catalogue/book_short.html', - {'book': self, 'tags': tags, 'formats': formats}) + self._short_html = unicode(render_to_string('catalogue/book_short.html', + {'book': self, 'tags': tags, 'formats': formats})) self.save() return mark_safe(self._short_html) @@ -207,7 +208,7 @@ class Fragment(models.Model): text = models.TextField() short_text = models.TextField(editable=False) _short_html = models.TextField(editable=False) - anchor = models.IntegerField() + anchor = models.CharField(max_length=120) book = models.ForeignKey(Book, related_name='fragments') objects = models.Manager() @@ -221,8 +222,8 @@ class Fragment(models.Model): book_authors = [u'%s' % (tag.get_absolute_url(), tag.name) for tag in self.book.tags if tag.category == 'author'] - self._short_html = render_to_string('catalogue/fragment_short.html', - {'fragment': self, 'book': self.book, 'book_authors': book_authors}) + self._short_html = unicode(render_to_string('catalogue/fragment_short.html', + {'fragment': self, 'book': self.book, 'book_authors': book_authors})) self.save() return mark_safe(self._short_html)