diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-02-09 13:09:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-16 16:41:50 +0200 |
| commit | a6e806ddd867ef953715c5beed8015006f8a14c5 (patch) | |
| tree | 551883016fc783b5665cedd4917e38310622d912 /ishtar_common | |
| parent | ea1351c32d4a34e0eaf6ac4cba77135c3350de67 (diff) | |
| download | Ishtar-a6e806ddd867ef953715c5beed8015006f8a14c5.tar.bz2 Ishtar-a6e806ddd867ef953715c5beed8015006f8a14c5.zip | |
✨ find/document sheet update
fields: quantity_comment, technical_areas, technical_processes, rights_owner, licenses, copyright, shooting_angle.
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_document.html | 5 |
2 files changed, 7 insertions, 4 deletions
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 %} <h4 class="col-12">{% trans "Format" %}</h4> {% 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 %} |