From: Radek Czajka Date: Mon, 14 Nov 2022 13:03:19 +0000 (+0100) Subject: Use years of birth and death in author descriptions. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/391d6cbc649f387a731f724cd4cf7dbcb02e26c2?ds=sidebyside Use years of birth and death in author descriptions. --- diff --git a/src/catalogue/models.py b/src/catalogue/models.py index cbe80602..ea7bf54b 100644 --- a/src/catalogue/models.py +++ b/src/catalogue/models.py @@ -51,7 +51,7 @@ class Author(WikidataModel): (4, _("Unknown")), ], ) - notes = models.TextField(_("notes"), blank=True) + notes = models.TextField(_("notes"), blank=True, help_text=_('private')) gazeta_link = models.CharField(_("gazeta link"), max_length=255, blank=True) culturepl_link = models.CharField(_("culture.pl link"), max_length=255, blank=True) @@ -60,7 +60,7 @@ class Author(WikidataModel): photo_source = models.CharField(blank=True, max_length=255) photo_attribution = models.CharField(max_length=255, blank=True) - description = models.TextField(_("description"), blank=True) + description = models.TextField(_("description"), blank=True, help_text=_('for publication')) priority = models.PositiveSmallIntegerField( _("priority"), @@ -176,7 +176,7 @@ class Book(WikidataModel): ) scans_source = models.CharField(_("scans source"), max_length=255, blank=True) text_source = models.CharField(_("text source"), max_length=255, blank=True) - notes = models.TextField(_("notes"), blank=True) + notes = models.TextField(_("notes"), blank=True, help_text=_('private')) priority = models.PositiveSmallIntegerField( _("priority"), default=0, choices=[(0, _("Low")), (1, _("Medium")), (2, _("High"))] @@ -262,7 +262,7 @@ class Book(WikidataModel): 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) + notes = models.TextField(_("notes"), blank=True, help_text=_('private')) class Meta: ordering = ('parent__name', 'name') @@ -280,7 +280,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) + notes = models.TextField(_("notes"), blank=True, help_text=_('private')) description = models.TextField(_("description"), blank=True) class Meta: diff --git a/src/catalogue/templates/catalogue/author_description.html b/src/catalogue/templates/catalogue/author_description.html index 09505918..26c35323 100644 --- a/src/catalogue/templates/catalogue/author_description.html +++ b/src/catalogue/templates/catalogue/author_description.html @@ -4,6 +4,8 @@
{% if obj.date_of_birth %} {{ obj.date_of_birth }} + {% elif obj.year_of_birth %} + {{ obj.year_of_birth }} {% endif %} {% if obj.place_of_birth %} w @@ -20,6 +22,8 @@
{% if obj.date_of_death %} {{ obj.date_of_death }} + {% elif obj.year_of_death %} + {{ obj.year_of_death }} {% endif %} {% if obj.place_of_death %} w