⚡️ custom form: better filter for JSON fields - 🐛 fix administrative act custom forms (refs #6238, refs #6239)

2 files changed, 11 insertions, 9 deletions

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 04e85a2b0..2796bb844 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -210,7 +210,7 @@ class BasicFindForm(CustomForm, ManageOldType):
     file_upload = True
     form_label = _("Find")
     form_admin_name = _("Simple find - 020 - General")
-    form_slug = "simplefind-020-general"
+    form_slug = "find-020-simplegeneral"
     base_models = [
         "object_type",
         "material_type",
@@ -737,7 +737,7 @@ class ResultingFindForm(CustomForm, ManageOldType):
     file_upload = True
     form_label = _("Resulting find")
     form_admin_name = _("Treatment n-1 - 030 - Resulting find")
-    form_slug = "treatmentn1-030-resulting-find"
+    form_slug = "treatment-030-n1-resulting-find"
 
     associated_models = {
         "resulting_material_type": models.MaterialType,
@@ -845,7 +845,7 @@ class ResultingFindForm(CustomForm, ManageOldType):
 class ResultingFindsForm(CustomForm, ManageOldType):
     form_label = _("Resulting finds")
     form_admin_name = _("Treatment 1-n - 030 - Resulting finds")
-    form_slug = "treatment1n-030-resulting-finds"
+    form_slug = "treatment-030-1n-resulting-finds"
     associated_models = {}
 
     resultings_number = forms.IntegerField(
diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index 3131f4e1d..3b71b388d 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -374,7 +374,7 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
 class N1TreatmentForm(BaseTreatmentForm):
     UPSTREAM_IS_MANY = True
     form_admin_name = _("Treatment n-1 - 020 - General")
-    form_slug = "treatmentn1-020-general"
+    form_slug = "treatment-020-n1-general"
 
     TYPES = [
         FieldType('treatment_status', models.TreatmentStatus, True),
@@ -390,7 +390,7 @@ class N1TreatmentForm(BaseTreatmentForm):
 class OneNTreatmentForm(BaseTreatmentForm):
     DOWNSTREAM_IS_MANY = True
     form_admin_name = _("Treatment 1-n - 020 - General")
-    form_slug = "treatment1n-020-general"
+    form_slug = "treatment-020-1n-general"
 
     TYPES = [
         FieldType('treatment_status', models.TreatmentStatus, True),
@@ -667,8 +667,8 @@ class AdministrativeActTreatmentFormSelection(
 
 
 class AdministrativeActTreatmentForm(AdministrativeActForm):
-    form_admin_name = _("Treatment - Administrative act - General")
-    form_slug = "treatment-adminact-general"
+    form_admin_name = _("Administrative act - Treatment - General")
+    form_slug = "adminact-treatment-general"
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
 
     TYPES = [
@@ -756,6 +756,8 @@ class TreatmentFileFormSelectionMultiple(MultiSearchForm):
 
 
 class TreatmentFileForm(CustomForm, ManageOldType):
+    form_admin_name = _("Treatment file - 010 - General")
+    form_slug = "treatmentfile-010-general"
     form_label = _("Treatment request")
     base_models = ['treatment_type_type']
     associated_models = {
@@ -929,8 +931,8 @@ class AdministrativeActTreatmentFileFormSelection(
 
 
 class AdministrativeActTreatmentFileForm(AdministrativeActForm):
-    form_admin_name = _("Treatment request - Administrative act - General")
-    form_slug = "treatmentfile-adminact-general"
+    form_admin_name = _("Administrative act - Treatment request - General")
+    form_slug = "adminact-treatmentfile-general"
     act_type = forms.ChoiceField(label=_("Act type"), choices=[])
 
     TYPES = [