diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-fr.json | 16 | ||||
| -rw-r--r-- | ishtar_common/fixtures/initial_importtypes-tests-fr.json | 4 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index 670f1cf94..5f88400b0 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -2978,6 +2978,14 @@ "model": "ishtar_common.formatertype", "fields": { "formater_type": "TypeFormater", + "options": "archaeological_finds.models.RecommendedTreatmentType", + "many_split": "&" + } +}, +{ + "model": "ishtar_common.formatertype", + "fields": { + "formater_type": "TypeFormater", "options": "archaeological_context_records.models.IdentificationType", "many_split": "&" } @@ -5679,10 +5687,10 @@ "ishtar-finds", 15 ], - "target": "preservation_to_considers", + "target": "recommended_treatments", "formater_type": [ "TypeFormater", - "archaeological_finds.models.TreatmentType", + "archaeological_finds.models.RecommendedTreatmentType", "&" ], "force_new": false, @@ -6933,10 +6941,10 @@ "inventory_combo", 25 ], - "target": "preservation_to_considers", + "target": "recommended_treatments", "formater_type": [ "TypeFormater", - "archaeological_finds.models.TreatmentType", + "archaeological_finds.models.RecommendedTreatmentType", "&" ], "force_new": false, diff --git a/ishtar_common/fixtures/initial_importtypes-tests-fr.json b/ishtar_common/fixtures/initial_importtypes-tests-fr.json index dfd31ee5b..e8bdb40f9 100644 --- a/ishtar_common/fixtures/initial_importtypes-tests-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-tests-fr.json @@ -1539,10 +1539,10 @@ "mcc-mobilier", 18 ], - "target": "preservation_to_considers", + "target": "recommended_treatments", "formater_type": [ "TypeFormater", - "archaeological_finds.models.TreatmentType", + "archaeological_finds.models.RecommendedTreatmentType", "&" ], "force_new": false, diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 4f81a2cf0..156c12184 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -126,7 +126,7 @@ LIST_FIELDS = { # key: hierarchic depth "museum_marking_type": 0, "museum_collection": 0, "batch": 0, - "preservation_to_considers": 0, + "recommended_treatments": HIERARCHIC_LEVELS, "integrities": 0, "remarkabilities": 0, "checked_type": 0, |