X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f42848b5995d52b1812131c197553a821dfb7e16..4fae06ea1b9fec1a45482ac043aa049ebce3f465:/src/catalogue/models.py?ds=sidebyside diff --git a/src/catalogue/models.py b/src/catalogue/models.py index cd64f843..b0d3697b 100644 --- a/src/catalogue/models.py +++ b/src/catalogue/models.py @@ -6,7 +6,6 @@ from django.urls import reverse from django.utils.translation import gettext_lazy as _ from wikidata.client import Client from .constants import WIKIDATA -from .utils import UnrelatedManager from .wikidata import WikidataMixin @@ -64,6 +63,10 @@ class Author(WikidataMixin, models.Model): def get_absolute_url(self): return reverse("catalogue_author", args=[self.slug]) + @property + def name(self): + return f"{self.last_name}, {self.first_name}" + @property def pd_year(self): if self.year_of_death: @@ -136,8 +139,6 @@ class Book(WikidataMixin, models.Model): estimated_verses = models.IntegerField(_("estimated number of verses"), null=True, blank=True) estimate_source = models.CharField(_("source of estimates"), max_length=2048, blank=True) - objects = UnrelatedManager() - class Meta: ordering = ("title",) verbose_name = _('book') @@ -163,16 +164,20 @@ class Book(WikidataMixin, models.Model): def get_absolute_url(self): return reverse("catalogue_book", args=[self.slug]) + + @property + def wluri(self): + return f'https://wolnelektury.pl/katalog/lektura/{self.slug}/' def authors_str(self): return ", ".join(str(author) for author in self.authors.all()) + authors_str.admin_order_field = 'authors__last_name' + authors_str.short_description = _('Author') def translators_str(self): return ", ".join(str(author) for author in self.translators.all()) - - def get_document_books(self): - DBook = apps.get_model("documents", "Book") - return DBook.objects.filter(dc_slug=self.slug) + translators_str.admin_order_field = 'translators__last_name' + translators_str.short_description = _('Translator') def get_estimated_costs(self): return { @@ -184,6 +189,7 @@ class Book(WikidataMixin, models.Model): class CollectionCategory(models.Model): name = models.CharField(_("name"), max_length=255) parent = models.ForeignKey('self', models.SET_NULL, related_name='children', null=True, blank=True, verbose_name=_("parent")) + notes = models.TextField(_("notes"), blank=True) class Meta: ordering = ('parent__name', 'name') @@ -201,6 +207,7 @@ class Collection(models.Model): name = models.CharField(_("name"), max_length=255) slug = models.SlugField(max_length=255, unique=True) category = models.ForeignKey(CollectionCategory, models.SET_NULL, null=True, blank=True, verbose_name=_("category")) + notes = models.TextField(_("notes"), blank=True) class Meta: ordering = ('category', 'name')