From 0472156fe3a1fd88d55a01e096d48b6a049b2e16 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 9 Feb 2024 13:09:05 +0100 Subject: ✨ find/document sheet update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fields: quantity_comment, technical_areas, technical_processes, rights_owner, licenses, copyright, shooting_angle. --- ishtar_common/models.py | 6 +++--- ishtar_common/templates/ishtar/sheet_document.html | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index aa7fda851..ebba1c034 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4453,6 +4453,9 @@ class Document( publishing_year = models.PositiveIntegerField( _("Year of publication"), blank=True, null=True ) + licenses = models.ManyToManyField( + LicenseType, verbose_name=_("Rights of use / license"), blank=True + ) rights_owner = models.ForeignKey( Organization, verbose_name=_("Rights owner"), @@ -4460,9 +4463,6 @@ class Document( null=True, on_delete=models.SET_NULL, ) - licenses = models.ManyToManyField( - LicenseType, verbose_name=_("Rights of use / license"), blank=True - ) copyright = models.TextField(_("Copyright"), blank=True, default="") tags = models.ManyToManyField(DocumentTag, verbose_name=_("Tags"), blank=True) language = models.ForeignKey( diff --git a/ishtar_common/templates/ishtar/sheet_document.html b/ishtar_common/templates/ishtar/sheet_document.html index 304d13579..4a52be1ba 100644 --- a/ishtar_common/templates/ishtar/sheet_document.html +++ b/ishtar_common/templates/ishtar/sheet_document.html @@ -46,11 +46,12 @@ {% field_flex "Type" item.source_type_html "" "" 1 %} {% include "ishtar/blocks/sheet_creation_section.html" %} - {% if item.format_type or item.support_type or item.scale %} + {% if item.format_type or item.support_type or item.scale or item.shooting_angle %}

{% trans "Format" %}

{% field_flex "Format" item.format_type %} {% field_flex "Support" item.support_type %} {% field_flex "Scale" item.scale %} + {% field_flex "Shooting angle" item.shooting_angle %} {% endif %} {% if item.associated_file or item.associated_url or item.tags.count %} @@ -87,6 +88,8 @@ {% field_flex "ISBN" item.isbn %} {% field_flex "ISSN" item.issn %} {% field_flex_multiple_obj "Rights of use / licenses" item 'licenses' %} + {% field_flex_detail "Rights owner" item.rights_owner %} + {% field_flex "Copyright" item.copyright %} {% endif %} {% if item.source or item.source_free_input %} -- cgit v1.2.3