X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/90f3cd6c555c7e976016b1d0cdda1e68b098764a..a426e3eefad0d817660f7770f5fd425511c37e47:/apps/catalogue/models.py diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index 30131bdbf..8a7722749 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -43,6 +43,7 @@ class Tag(TagBase): 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) + book_count = models.IntegerField(_('book count'), default=0, blank=False, null=False) def has_description(self): return len(self.description) > 0 @@ -97,6 +98,10 @@ class Book(models.Model): tagged = managers.ModelTaggedItemManager(Tag) tags = managers.TagDescriptor(Tag) + @property + def name(self): + return self.title + def short_html(self): if len(self._short_html): return mark_safe(self._short_html) @@ -111,8 +116,8 @@ class Book(models.Model): formats.append(u'Plik PDF' % self.pdf_file.url) if self.odt_file: formats.append(u'Plik ODT' % self.odt_file.url) - if self.odt_file: - formats. + if self.txt_file: + formats.append(u'Plik TXT' % self.txt_file.url) self._short_html = unicode(render_to_string('catalogue/book_short.html', {'book': self, 'tags': tags, 'formats': formats})) @@ -198,7 +203,8 @@ class Book(models.Model): short_text = '' if (len(MarkupString(text)) > 240): short_text = unicode(MarkupString(text)[:160]) - new_fragment = Fragment(text=text, short_text=short_text, anchor=fragment.id, book=book) + new_fragment, created = Fragment.objects.get_or_create(anchor=fragment.id, book=book, + defaults={'text': text, 'short_text': short_text}) try: theme_names = [s.strip() for s in fragment.themes.split(',')]