X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/716b8c747d234589ed9eeac5ee64dacd062b24dc..eec315008f3b90ff77971d4e43a6d26fa4ee63c7:/apps/catalogue/models.py?ds=inline diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py index fa6c13225..1d0b83b65 100644 --- a/apps/catalogue/models.py +++ b/apps/catalogue/models.py @@ -12,7 +12,6 @@ from django.template.defaultfilters import slugify from django.utils.safestring import mark_safe from django.utils.translation import get_language from django.core.urlresolvers import reverse -from datetime import datetime from django.conf import settings @@ -61,7 +60,6 @@ class Tag(TagBase): user = models.ForeignKey(User, blank=True, null=True) book_count = models.IntegerField(_('book count'), blank=False, null=True) - death = models.IntegerField(_(u'year of death'), blank=True, null=True) gazeta_link = models.CharField(blank=True, max_length=240) wiki_link = models.CharField(blank=True, max_length=240) @@ -96,17 +94,6 @@ class Tag(TagBase): has_description.short_description = _('description') has_description.boolean = True - def alive(self): - return self.death is None - - def in_pd(self): - """ tests whether an author is in public domain """ - return self.death is not None and self.goes_to_pd() <= datetime.now().year - - def goes_to_pd(self): - """ calculates the year of public domain entry for an author """ - return self.death + 71 if self.death is not None else None - def get_count(self): """ returns global book count for book tags, fragment count for themes """ @@ -355,9 +342,9 @@ class Book(models.Model): if self.has_media("txt"): formats.append(u'TXT' % self.get_media('txt').url) # other files - for m in self.media.order_by('type'): + for m in self.medias.order_by('type'): formats.append(u'%s' % m.type, m.file.url) - + formats = [mark_safe(format) for format in formats] setattr(self, key, unicode(render_to_string('catalogue/book_short.html', @@ -661,6 +648,24 @@ class Book(models.Model): return self.refresh_theme_counter() return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems()) + def pretty_title(self, html_links=False): + book = self + names = list(book.tags.filter(category='author')) + + books = [] + while book: + books.append(book) + book = book.parent + names.extend(reversed(books)) + + if html_links: + names = ['%s' % (tag.get_absolute_url(), tag.name) for tag in names] + else: + names = [tag.name for tag in names] + + return ', '.join(names) + + class Fragment(models.Model): text = models.TextField() short_text = models.TextField(editable=False) @@ -692,34 +697,6 @@ class Fragment(models.Model): return mark_safe(getattr(self, key)) -class BookStub(models.Model): - title = models.CharField(_('title'), max_length=120) - author = models.CharField(_('author'), max_length=120) - pd = models.IntegerField(_('goes to public domain'), null=True, blank=True) - slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True) - translator = models.TextField(_('translator'), blank=True) - translator_death = models.TextField(_('year of translator\'s death'), blank=True) - - class Meta: - ordering = ('title',) - verbose_name = _('book stub') - verbose_name_plural = _('book stubs') - - def __unicode__(self): - return self.title - - @permalink - def get_absolute_url(self): - return ('catalogue.views.book_detail', [self.slug]) - - def in_pd(self): - return self.pd is not None and self.pd <= datetime.now().year - - @property - def name(self): - return self.title - - class FileRecord(models.Model): slug = models.SlugField(_('slug'), max_length=120, db_index=True) type = models.CharField(_('type'), max_length=20, db_index=True)