Merge pull request #288 from plone/getVocabulary-incomplete-html

getVocabulary: Call scrub_html on individual items

news/288.bugfix

@@ -0,0 +1 @@
+getVocabulary: Fix for terms with incomplete HTML

plone/app/content/browser/vocabulary.py

@@ -261,18 +261,18 @@ def __call__(self):
         else:
             items = [
                 {
-                    "id": item.value,
-                    "text": (item.title if item.title else ""),
+                    "id": unescape(transform.scrub_html(item.value)),
+                    "text": (
+                        unescape(transform.scrub_html(item.title)) if item.title else ""
+                    ),
                 }
                 for item in results
             ]
 
         if total == 0:
             total = len(items)
 
-        return unescape(
-            transform.scrub_html(json_dumps({"results": items, "total": total}))
-        )
+        return json_dumps({"results": items, "total": total})
 
     def parsed_query(
         self,

plone/app/content/tests/test_widgets.py

@@ -680,6 +680,29 @@ def testGetMimeIcon(self):
             [{"getMimeIcon": "/plone/++resource++mimetype.icons/unknown.png"}],
         )
 
+    def testGeneratesValidJson(self):
+        from zope.schema.vocabulary import SimpleTerm
+        from zope.schema.vocabulary import SimpleVocabulary
+
+        view = VocabularyView(self.portal, self.request)
+        vocab = SimpleVocabulary(
+            [
+                SimpleTerm(
+                    token=f"term {idx} <b>",
+                    value=f"term {idx} <b>",
+                    title=f"term {idx} <b>",
+                )
+                for idx in range(3)
+            ]
+        )
+        with mock.patch.object(view, "get_vocabulary", return_value=vocab):
+            result = view()
+        # The above values could result in invalid json if there is an error in
+        # the code: the following call would give a json.decoder.JSONDecodeError.
+        # See https://github.com/plone/plone.app.content/pull/288
+        parsed = json.loads(result)
+        self.assertEqual(parsed["results"][0]["text"], "term 0 <b></b>")
+
 
 class FunctionalBrowserTest(unittest.TestCase):
     layer = PLONE_APP_CONTENT_DX_FUNCTIONAL_TESTING