From 1cae0792637e796f600e034384cde23960f28e48 Mon Sep 17 00:00:00 2001 From: Thomas Massmann Date: Fri, 11 Jun 2021 12:31:01 +0200 Subject: [PATCH] fix(ISSUE-279): :bug: set fieldset description as attribute, not node, when migrating from PFG --- news/279.bugfix | 2 ++ src/collective/easyform/migration/fields.py | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 news/279.bugfix diff --git a/news/279.bugfix b/news/279.bugfix new file mode 100644 index 00000000..44a5783a --- /dev/null +++ b/news/279.bugfix @@ -0,0 +1,2 @@ +Set fieldset description as attribute, not node, when migrating from PFG. +[thomasmassmann] \ No newline at end of file diff --git a/src/collective/easyform/migration/fields.py b/src/collective/easyform/migration/fields.py index b1f47ea1..2ba32270 100644 --- a/src/collective/easyform/migration/fields.py +++ b/src/collective/easyform/migration/fields.py @@ -128,6 +128,13 @@ def append_or_set_title(field, name, value): append_node(field, name, value) +def append_or_set_description(field, name, value): + if field.tag == 'fieldset': + set_attribute(field, 'description', value) + else: + append_node(field, name, value) + + def convert_tales_expressions(value): if value == u'here/memberEmail': return u"python:member and member.getProperty('email', '') or ''" @@ -171,7 +178,7 @@ def to_text(value): } PROPERTIES_MAPPING = { - 'description': Property('description', append_node), + 'description': Property('description', append_or_set_description), 'fgDefault': Property('default', append_default_node), 'fgmaxlength': Property('max_length', append_maxlength_node), 'fgsize': None, # Not available in collective.easyform