diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-15 12:20:42 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-01-15 12:20:42 +0100 |
| commit | c7dd9c66591e8b9b9a85a08e18527cfc3196a54c (patch) | |
| tree | 969e1122bc85ea517076b7e10cf85bf97a99fb90 | |
| parent | 8f45297edd7dfdd677b9a708b560532073b2c62f (diff) | |
| download | Ishtar-c7dd9c66591e8b9b9a85a08e18527cfc3196a54c.tar.bz2 Ishtar-c7dd9c66591e8b9b9a85a08e18527cfc3196a54c.zip | |
Finds: settings for M2M history
| -rw-r--r-- | archaeological_finds/models_finds.py | 3 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 9f81a5ecf..a2080132e 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1045,7 +1045,8 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, OwnPerms, ] HISTORICAL_M2M = [ 'material_types', 'datings', 'object_types', 'integrities', - 'remarkabilities', 'communicabilities', + 'remarkabilities', 'communicabilities', 'preservation_to_considers', + 'alterations', 'alteration_causes' ] objects = ExternalIdManager() diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index a7302d16a..35558498e 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -144,14 +144,14 @@ {% field_flex "Is complete?" item.is_complete %} {% field_flex_multiple_obj "Material types" item 'material_types' %} {% field_flex "Material type quality" item.material_type_quality %} - {% field_flex_multiple "Object types" item.object_types %} + {% field_flex_multiple_obj "Object types" item.object_types %} {% field_flex "Object type quality" item.object_type_quality %} {% field_flex "Find number" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %} {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %} {% field_flex "Manufacturing place" item.manufacturing_place %} - {% field_flex_multiple "Communicability" item.communicabilities %} + {% field_flex_multiple_obj "Communicability" item.communicabilities %} {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} </div> @@ -188,12 +188,12 @@ {% if item.integrities.count or item.remarkabilities.count or item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.appraisal_date or item.treatment_emergency or item.insurance_value or item.estimated_value %} <h3>{% trans "Preservation" %}</h3> <div class='row'> - {% field_flex_multiple "Integrity / interest" item.integrities %} - {% field_flex_multiple "Remarkability" item.remarkabilities %} + {% field_flex_multiple_obj "Integrity / interest" item.integrities %} + {% field_flex_multiple_obj "Remarkability" item.remarkabilities %} {% field_flex "Conservatory state" item.conservatory_state %} - {% field_flex_multiple "Alteration" item.alterations %} - {% field_flex_multiple "Alteration cause" item.alteration_causes %} - {% field_flex_multiple "Recommended treatments" item.preservation_to_considers %} + {% field_flex_multiple_obj "Alteration" item.alterations %} + {% field_flex_multiple_obj "Alteration cause" item.alteration_causes %} + {% field_flex_multiple_obj "Recommended treatments" item.preservation_to_considers %} {% field_flex "Treatment emergency" item.treatment_emergency %} {% field_flex "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %} {% field_flex "Insurance value" item.insurance_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %} |