Merge branch 'main' into csv_columns_ordering

Author: cekk

CHANGES.rst

@@ -1,7 +1,7 @@
 Changelog
 =========
 
-3.2.2 (unreleased)
+3.2.3 (unreleased)
 ------------------
 
 - Now in the CSV export the obsolete records fields are ordered
@@ -12,6 +12,13 @@ Changelog
   [folix-01]
 
 
+3.2.2 (2025-03-05)
+------------------
+
+- Format list values in format_fields as comma separated strings to improve readability on email messages.
+  [cekk]
+
+
 3.2.1 (2025-01-09)
 ------------------
 

setup.py

@@ -15,7 +15,7 @@
 
 setup(
     name="collective.volto.formsupport",
-    version="3.2.2.dev0",
+    version="3.2.3.dev0",
     description="Add support for customizable forms in Volto",
     long_description=long_description,
     # Get more from https://pypi.org/classifiers/

src/collective/volto/formsupport/adapters/post.py

@@ -149,7 +149,7 @@ def validate_email_fields(self):
         for form_field in self.form_data.get("data", []):
             if form_field.get("field_id", "") not in email_fields:
                 continue
-            if _isemail(form_field.get("value", "")) is None:
+            if not _isemail(form_field.get("value", "")):
                 raise BadRequest(
                     translate(
                         _(
@@ -262,9 +262,11 @@ def format_fields(self):
 
             if field_id:
                 field_index = field_ids.index(field_id)
-
+                value = field.get("value", "")
+                if isinstance(value, list):
+                    field["value"] = ", ".join(value)
                 if self.block["subblocks"][field_index].get("field_type") == "date":
-                    field["value"] = api.portal.get_localized_time(field["value"])
+                    field["value"] = api.portal.get_localized_time(value)
 
             formatted_fields.append(field)
 

src/collective/volto/formsupport/tests/test_form_data_adapter.py

@@ -0,0 +1,45 @@
+from collective.volto.formsupport.interfaces import IPostAdapter
+from collective.volto.formsupport.testing import VOLTO_FORMSUPPORT_INTEGRATION_TESTING
+from plone import api
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from zope.component import getMultiAdapter
+
+import unittest
+
+
+class TestFormDataAdapter(unittest.TestCase):
+    layer = VOLTO_FORMSUPPORT_INTEGRATION_TESTING
+
+    def setUp(self):
+        self.app = self.layer["app"]
+        self.portal = self.layer["portal"]
+        self.request = self.layer["request"]
+        self.portal_url = self.portal.absolute_url()
+        setRoles(self.portal, TEST_USER_ID, ["Manager"])
+
+        self.document = api.content.create(
+            type="Document",
+            title="Example context",
+            container=self.portal,
+        )
+        self.document.blocks = {
+            "form-id": {
+                "@type": "form",
+                "send": ["recipient"],
+                "subblocks": [
+                    {
+                        "field_id": "xxx",
+                        "field_type": "text",
+                    },
+                ],
+            }
+        }
+
+    def test_format_fields_join_list_values(self):
+        self.request["BODY"] = (
+            b'{"data": [{"field_id": "xxx", "value": ["a", "b"]}], "block_id": "form-id"}'
+        )
+        adapter = getMultiAdapter((self.document, self.request), IPostAdapter)
+
+        self.assertEqual(adapter.format_fields()[0]["value"], "a, b")