Skip to content

Commit 6d2c2c3

Browse files
authored
Fix formsupport 3.3.0 compatibility (in add patch). (#82)
* Fix formsupport 3.3.0 compatibility (in add patch). * other fixes * fix version
1 parent 2acdaec commit 6d2c2c3

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

CHANGES.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ Changelog
44
5.0.18 (unreleased)
55
-------------------
66

7-
- Nothing changed yet.
8-
7+
- Fix formsupport 3.3.0 compatibility (in add patch).
8+
[cekk]
9+
910

1011
5.0.17 (2025-10-02)
1112
-------------------

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"design.plone.contenttypes>=6.0.0.dev0",
5555
"collective.feedback",
5656
"collective.volto.dropdownmenu",
57-
"collective.volto.formsupport[honeypot]>=3.2.0,<=3.3.0",
57+
"collective.volto.formsupport[honeypot]>=3.3.0,<3.4.0",
5858
"collective.volto.secondarymenu",
5959
"collective.volto.socialsettings",
6060
"collective.volto.slimheader",

src/design/plone/policy/patches/collective_volto_formsupport.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -205,23 +205,29 @@ def add(self, data):
205205
return None
206206

207207
fields = {
208-
x["field_id"]: x.get("custom_field_id", x.get("label", x["field_id"]))
209-
for x in form_fields
208+
f["field_id"]: {
209+
"label": f.get("custom_field_id", f.get("label", f["field_id"])),
210+
"type": f.get("field_type", "text"),
211+
}
212+
for f in form_fields
210213
}
211214
record = Record()
212215
fields_labels = {}
213216
fields_order = []
214-
# start patch
217+
fields_types = {}
215218
for field_data in data:
216-
# end patch
217219
field_id = field_data.get("field_id", "")
218220
value = field_data.get("value", "")
219221
if field_id in fields:
220-
record.attrs[field_id] = value
221-
fields_labels[field_id] = fields[field_id]
222+
field = fields[field_id]
223+
record.attrs[field_id] = self.storedValue(value, field["type"])
224+
fields_types[field_id] = field.get("type", "")
225+
fields_labels[field_id] = field["label"]
222226
fields_order.append(field_id)
227+
# else: skip the field
223228
record.attrs["fields_labels"] = fields_labels
224229
record.attrs["fields_order"] = fields_order
230+
record.attrs["fields_types"] = fields_types
225231
record.attrs["date"] = datetime.now()
226232
record.attrs["block_id"] = self.block_id
227233

test_plone60.cfg

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ extends =
99
update-versions-file = test_plone60.cfg
1010

1111
[versions]
12-
# to remove when released
13-
collective.volto.formsupport = 3.2.2
1412

1513
# Added by buildout at 2021-12-29 11:05:41.321569
1614
flake8 = 6.0.0

0 commit comments

Comments
 (0)