cherry-picked 9375849

from @fredvd
plone · Jun 1, 2017 · 734f8a3 · 734f8a3
1 parent 68a1720
commit 734f8a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -7,6 +7,10 @@ Changelog
 - Fix `get_tinymce_options` for non-contentish contexts. See #161.
   [petschki]
 
+- Fix RelatedItemsWidget calling self.items, which was turned back into a
+  property in z3c.form 3.2.11. (Used in Plone > 4.3.11)
+  [fredvd]
+
 
 1.9.1 (2017-02-12)
 ------------------

diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
@@ -612,7 +612,10 @@ def _base_args(self):
             options['allowClear'] = True
 
         items = []
-        for item in self.items():
+        fetchitems = self.items
+        if callable(fetchitems):
+            fetchitems = fetchitems()
+        for item in fetchitems:
             if not isinstance(item['content'], basestring):
                 item['content'] = translate(
                     item['content'],