From 7e631d9a322a8bb530652e7adac073d18baf326b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 18 Apr 2024 16:35:46 +0200 Subject: 🗃️ conservation state becomes multi-valued (refs #5904) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ishtar_common/fixtures/initial_importtypes-fr.json | 14 +++++++------- ishtar_common/views_item.py | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index bf897ebda..8cf53a65e 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -4167,7 +4167,7 @@ "fields": { "formater_type": "TypeFormater", "options": "archaeological_finds.models.ConservatoryState", - "many_split": "" + "many_split": "&" } }, { @@ -6339,11 +6339,11 @@ "mcc-mobilier", 17 ], - "target": "conservatory_state", + "target": "conservatory_states", "formater_type": [ "TypeFormater", "archaeological_finds.models.ConservatoryState", - "" + "&" ], "force_new": false, "concat": false, @@ -8182,11 +8182,11 @@ "ishtar-finds", 12 ], - "target": "conservatory_state", + "target": "conservatory_states", "formater_type": [ "TypeFormater", "archaeological_finds.models.ConservatoryState", - "" + "&" ], "force_new": false, "concat": false, @@ -9759,11 +9759,11 @@ "inventory_combo", 22 ], - "target": "conservatory_state", + "target": "conservatory_states", "formater_type": [ "TypeFormater", "archaeological_finds.models.ConservatoryState", - "" + "&" ], "force_new": false, "concat": false, diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 6865f3932..270337ad1 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -560,7 +560,7 @@ def revert_item(model): HIERARCHIC_LEVELS = 5 LIST_FIELDS = { # key: hierarchic depth - "conservatory_state": HIERARCHIC_LEVELS, + "conservatory_states": HIERARCHIC_LEVELS, "identification": HIERARCHIC_LEVELS, "material_types": HIERARCHIC_LEVELS, "material_type": HIERARCHIC_LEVELS, -- cgit v1.2.3