Merge branch 'main' into fix_tipologia_notizia_criteria

Author: cekk

CHANGES.rst

@@ -5,6 +5,8 @@ Changelog
 1.0.4 (unreleased)
 ------------------
 
+- Fix mapping for Persona.
+  [daniele]
 - Remove tipoligia_notizia taxonomy (from v3) and index v2 field.
   [cekk]
 - Re-add tipologia_notizia criteria.

src/design/plone/ctgeneric/__init__.py

@@ -24,7 +24,8 @@
         },
     ]
 )
-subfolders_mapping["Persona"] = persona_folders
+
+subfolders_mapping["Persona"] = {"allowed_types": [], "content": persona_folders}
 
 common.SUBFOLDERS_MAPPING = subfolders_mapping
 

src/design/plone/ctgeneric/tests/test_ct_event.py

@@ -97,7 +97,7 @@ def test_event_fields_default_fieldset(self):
                 "recurrence",
                 "tassonomia_argomenti",
                 "sottotitolo",
-            ]
+            ],
             # should be like this, but in tests SchemaTweaks does not work
             # [
             #     "title",
@@ -148,7 +148,7 @@ def test_event_fields_correlati_fieldset(self):
         resp = self.api_session.get("@types/Event").json()
         self.assertEqual(
             resp["fieldsets"][7]["fields"],
-            ["correlato_in_evidenza"]
+            ["correlato_in_evidenza"],
             # should be like this but SchemaTweaks does not work in tests
             # ["correlato_in_evidenza", "relatedItems"],
         )
@@ -160,7 +160,7 @@ def test_event_fields_categorization_fieldset(self):
         resp = self.api_session.get("@types/Event").json()
         self.assertEqual(
             resp["fieldsets"][8]["fields"],
-            ["subjects", "language", "relatedItems"]
+            ["subjects", "language", "relatedItems"],
             # should be like this with SchemaTweaks
             # ["subjects", "language"],
         )