Merge pull request #61 from plone/datakurre-vocabularies

Fix issue where serializing vocabulary terms into '|' syntax failed when values contained non-ascii characters
plone · Aug 14, 2018 · f50e596 · f50e596 · jenkins-plone-org · Aug 14, 2018
2 parents 0bd2d1e + 234e017
commit f50e596
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,10 @@ New features:
 
 Bug fixes:
 
+- Fix issue where serializing vocabulary terms into '|' syntax failed when
+  values contained non-ascii characters
+  [datakurre]
+
 - Allow defaults to be set on dexterity type fields via the web UI (@@fields)
   [ezvirtual]
 

diff --git a/plone/schemaeditor/fields.py b/plone/schemaeditor/fields.py
@@ -120,7 +120,8 @@ def __getattr__(self, name):
             values = []
             for term in (self.field.vocabulary or []):
                 if term.value != term.title:
-                    values.append('{0:s}|{1:s}'.format(term.value, term.title))
+                    values.append(u'{0:s}|{1:s}'.format(
+                        term.value, term.title))
                 else:
                     values.append(term.value)
             return values
@@ -132,8 +133,8 @@ def _constructVocabulary(self, value):
         terms = []
         if value:
             for item in value:
-                if item and '|' in item:
-                    voc_value, voc_title = item.split('|', 1)
+                if item and u'|' in item:
+                    voc_value, voc_title = item.split(u'|', 1)
                 else:
                     voc_value = item
                     voc_title = item
@@ -260,7 +261,8 @@ def __getattr__(self, name):
             values = []
             for term in (self.field.value_type.vocabulary or []):
                 if term.value != term.title:
-                    values.append('{0:s}|{1:s}'.format(term.value, term.title))
+                    values.append(u'{0:s}|{1:s}'.format(
+                        term.value, term.title))
                 else:
                     values.append(term.value)
             return values

diff --git a/plone/schemaeditor/tests/test_fields.py b/plone/schemaeditor/tests/test_fields.py
@@ -30,6 +30,10 @@ def assertVocabulary(self, voc, values):
     def test_singlechoice_voc(self):
         field = TextLineChoiceField(DummyField())
         field.values = [u'New York', u'city2|München']
+        self.assertEqual(
+            field.values,
+            [u'New York', u'city2|München']
+        )
         self.assertVocabulary(
             field.vocabulary,
             [(u'New York', u'New York', u'New York'),
@@ -39,6 +43,10 @@ def test_singlechoice_voc(self):
     def test_multichoice_voc(self):
         field = TextLineMultiChoiceField(DummyField())
         field.values = [u'New York', u'city1|Zürich']
+        self.assertEqual(
+            field.values,
+            [u'New York', u'city1|Zürich']
+        )
         self.assertVocabulary(
             field.vocabulary,
             [(u'New York', u'New York', u'New York'),