Fix using field_id in XML

collective · Jan 9, 2024 · 47ede0b · 47ede0b
1 parent 30adf28
commit 47ede0b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/collective/volto/formsupport/restapi/services/submit_form/field.py b/src/collective/volto/formsupport/restapi/services/submit_form/field.py
@@ -3,7 +3,6 @@ def __init__(self, field_data):
         def _attribute(attribute_name):
             setattr(self, attribute_name, field_data.get(attribute_name))
 
-        _attribute("field_id")
         _attribute("field_type")
         _attribute("id")
         _attribute("show_when_when")
@@ -18,6 +17,7 @@ def _attribute(attribute_name):
         self._value = field_data.get("value", "")
         self._custom_field_id = field_data.get("custom_field_id")
         self._label = field_data.get("label", "")
+        self._field_id = field_data.get("field_id", "")
 
     @property
     def value(self):
@@ -31,14 +31,22 @@ def value(self, value):
 
     @property
     def label(self):
-        if self._custom_field_id:
-            return self._custom_field_id
         return self._label if self._label else self.field_id
 
     @label.setter
     def label(self, label):
         self._label = label
 
+    @property
+    def field_id(self):
+        if self._custom_field_id:
+            return self._custom_field_id
+        return self._field_id if self._field_id else self._label
+
+    @field_id.setter
+    def field_id(self, field_id):
+        self._field_id = field_id
+
     @property
     def send_in_email(self):
         return True

diff --git a/src/collective/volto/formsupport/restapi/services/submit_form/post.py b/src/collective/volto/formsupport/restapi/services/submit_form/post.py
@@ -411,7 +411,7 @@ def attach_xml(self, msg):
         xmlRoot = Element("form")
 
         for field in self.filter_parameters():
-            SubElement(xmlRoot, "field", name=field.label).text = str(field._value)
+            SubElement(xmlRoot, "field", name=field.field_id).text = str(field._value)
 
         doc = ElementTree(xmlRoot)
         doc.write(output, encoding="utf-8", xml_declaration=True)