🐛 fix default value for property

3 files changed, 87 insertions, 27 deletions

diff --git a/archaeological_finds/admin.py b/archaeological_finds/admin.py
index 77dae07e1..e056e2464 100644
--- a/archaeological_finds/admin.py
+++ b/archaeological_finds/admin.py
@@ -257,13 +257,18 @@ class ExhibitionAdmin(HistorizedObjectAdmin):
     exclude = ["documents", "main_image"]
 
 
+@admin.register(models.OwnerType, site=admin_site)
+class SourceTypeAdmin(GeneralTypeAdmin):
+    LIST_DISPLAY = ["label", "txt_idx", "available", "parent", "order", "comment"]
+
+
 general_models = [
     models.AlterationCauseType, models.AlterationType, models.BatchType,
     models.CollectionEntryModeType, models.IntegrityType, models.InventoryConformity,
     models.InventoryMarkingPresence, models.MarkingType, models.MaterialTypeQualityType,
     models.MuseumCollection, models.ObjectTypeQualityType, models.OriginalReproduction,
     models.RemarkabilityType, models.TreatmentEmergencyType, models.DiscoveryMethod,
-    models.ExhibitionType, models.OwnerType, models.OwnershipStatus
+    models.ExhibitionType, models.OwnershipStatus
 ]
 
 for model in general_models:
diff --git a/archaeological_finds/migrations/0139_data_migration_owner_type.json b/archaeological_finds/migrations/0139_data_migration_owner_type.json
index e49241655..e62500938 100644
--- a/archaeological_finds/migrations/0139_data_migration_owner_type.json
+++ b/archaeological_finds/migrations/0139_data_migration_owner_type.json
@@ -1,35 +1,89 @@
 [
-  {
+{
     "model": "archaeological_finds.ownertype",
     "fields": {
-      "label": "\u00c9tat",
-      "txt_idx": "etat",
-      "comment": "",
-      "available": true,
-      "order": 10,
-      "parent": null
+        "label": "Public",
+        "txt_idx": "public",
+        "comment": "",
+        "available": true,
+        "order": 10,
+        "parent": null
     }
-  },
-  {
+},
+{
     "model": "archaeological_finds.ownertype",
     "fields": {
-      "label": "Collectivit\u00e9",
-      "txt_idx": "collectivite",
-      "comment": "",
-      "available": true,
-      "order": 20,
-      "parent": null
+        "label": "Priv\u00e9",
+        "txt_idx": "prive",
+        "comment": "",
+        "available": true,
+        "order": 20,
+        "parent": null
     }
-  },
-  {
+},
+{
     "model": "archaeological_finds.ownertype",
     "fields": {
-      "label": "Inventeur",
-      "txt_idx": "inventeur",
-      "comment": "",
-      "available": true,
-      "order": 30,
-      "parent": null
+        "label": "\u00c9tat",
+        "txt_idx": "etat",
+        "comment": "",
+        "available": true,
+        "order": 10,
+        "parent": [
+            "public"
+        ]
     }
-  }
-]
\ No newline at end of file
+},
+{
+    "model": "archaeological_finds.ownertype",
+    "fields": {
+        "label": "Collectivit\u00e9 territoriale",
+        "txt_idx": "collectivite-territoriale",
+        "comment": "",
+        "available": true,
+        "order": 20,
+        "parent": [
+            "public"
+        ]
+    }
+},
+{
+    "model": "archaeological_finds.ownertype",
+    "fields": {
+        "label": "Particulier",
+        "txt_idx": "particulier",
+        "comment": "",
+        "available": true,
+        "order": 10,
+        "parent": [
+            "prive"
+        ]
+    }
+},
+{
+    "model": "archaeological_finds.ownertype",
+    "fields": {
+        "label": "Organisme priv\u00e9",
+        "txt_idx": "organisme-prive",
+        "comment": "",
+        "available": true,
+        "order": 20,
+        "parent": [
+            "prive"
+        ]
+    }
+},
+{
+    "model": "archaeological_finds.ownertype",
+    "fields": {
+        "label": "\u00c9tat d\u00e9tenteur pr\u00e9caire",
+        "txt_idx": "etat-detenteur-precaire",
+        "comment": "",
+        "available": true,
+        "order": 10,
+        "parent": [
+            "etat"
+        ]
+    }
+}
+]
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 09387e1a5..11a9eb66a 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -513,8 +513,9 @@ class OwnerType(OrderedHierarchicalType):
         verbose_name = _("Owner type")
         verbose_name_plural = _("Owner types")
         ordering = (
-            "order",
+            "parent__order",
             "parent__label",
+            "order",
             "label",
         )
     ADMIN_SECTION = _("Finds")