diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 12 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 3 | ||||
| -rw-r--r-- | ishtar_common/models.py | 6 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_document.html | 5 |
4 files changed, 16 insertions, 10 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 0df6cdf75..371b5b64c 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1865,6 +1865,12 @@ class Find( blank=True, null=True, ) + technical_processes = models.ManyToManyField( + TechnicalProcessType, + verbose_name=_("Technical processes"), + related_name="find", + blank=True, + ) material_comment = models.TextField( _("Comment on the material"), blank=True, default="" ) @@ -1942,12 +1948,6 @@ class Find( related_name="find", blank=True, ) - technical_processes = models.ManyToManyField( - TechnicalProcessType, - verbose_name=_("Technical processes"), - related_name="find", - blank=True, - ) integrities = models.ManyToManyField( IntegrityType, verbose_name=_("Integrity / interest"), diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index fdbc0c6c1..c163b7d57 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -176,12 +176,15 @@ {% field_flex_multiple_obj "Material types" item 'material_types' %} {% endif %}{% endwith %} {% field_flex "Material type quality" item.material_type_quality %} + {% field_flex_multiple_obj "Technical processes" item 'technical_processes' %} {% field_flex_full "Comment on the material" item.material_comment "<pre>" "</pre>" %} {% field_flex_multiple_obj "Object types" item 'object_types' %} {% field_flex "Object type quality" item.object_type_quality %} {% field_flex_multiple_obj "Functional areas" item 'functional_areas' %} + {% field_flex_multiple_obj "Technical areas" item 'technical_areas' %} {% field_flex "Number of remains" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} + {% field_flex_full "Comment on quantity" item.quantity_comment "<pre>" "</pre>" %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} 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 %} |