diff options
| -rw-r--r-- | archaeological_finds/models_finds.py | 18 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 |
2 files changed, 18 insertions, 2 deletions
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index e87925170..4d2427d5e 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1804,8 +1804,10 @@ class Find( BASE_SEARCH_VECTORS = [ SearchVectorConfig("cached_label", "raw"), SearchVectorConfig("cache_complete_museum_id", "raw"), + SearchVectorConfig("museum_id", "raw"), SearchVectorConfig("label", "raw"), SearchVectorConfig("description", "local"), + SearchVectorConfig("museum_id_comment", "local"), SearchVectorConfig("mark"), SearchVectorConfig("comment", "local"), SearchVectorConfig("dating_comment", "local"), @@ -1815,6 +1817,15 @@ class Find( SearchVectorConfig("laboratory_id", "raw"), SearchVectorConfig("decoration"), SearchVectorConfig("manufacturing_place"), + SearchVectorConfig("museum_owner_institution__name", "raw"), + SearchVectorConfig("museum_custodian_institution__name", "raw"), + SearchVectorConfig("museum_depositor_inventory_number", "raw"), + SearchVectorConfig("museum_entry_mode_comment"), + SearchVectorConfig("museum_entry_date_comment", "local"), + SearchVectorConfig("museum_donor__denomination"), + SearchVectorConfig("museum_collection__label"), + SearchVectorConfig("museum_former_collections__denomination"), + SearchVectorConfig("museum_inventory_transcript", "local"), ] M2M_SEARCH_VECTORS = [ SearchVectorConfig("datings__period__label", "local"), @@ -1897,16 +1908,21 @@ class Find( ] HISTORICAL_M2M = [ "material_types", + "technical_processes", "datings", + "cultural_attributions", "object_types", "functional_areas", + "technical_areas", "integrities", "remarkabilities", "communicabilities", + "museum_inventory_marking_presence", + "museum_marking_type", + "museum_former_collections", "preservation_to_considers", "alterations", "alteration_causes", - "cultural_attributions", ] GET_VALUES_EXTRA = ValueGetter.GET_VALUES_EXTRA + ["complete_id", "context_record_label"] diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index 7f8b2c506..4408709b4 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -165,7 +165,7 @@ {% field_flex "Conformity with inventory" item.museum_inventory_conformity %} {% field_flex "Comment on conformity" item.museum_conformity_comment %} {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} - {% field_flex "Inventory transcript" item.museum_inventory_transcript %} + {% field_flex_full "Inventory transcript" item.museum_inventory_transcript %} {% field_flex "Original/reproduction" item.museum_original_repro %} {% field_flex "Date of museum allocation" item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %} {% field_flex "Purchase price" item.museum_purchase_price %} |