Merge pull request #4135 from plone/tinymce-contentbrowser-options-6.2

Fix TinyMCE relatedItems options [6.2]

Author: gforcada

Products/CMFPlone/patterns/settings.py

@@ -3,7 +3,7 @@
 from borg.localrole.interfaces import IFactoryTempFolder
 from plone.app.content.browser.interfaces import IFolderContentsView
 from plone.app.z3cform.utils import call_callables
-from plone.app.z3cform.widgets.relateditems import get_relateditems_options
+from plone.app.z3cform.widgets.contentbrowser import get_contentbrowser_options
 from plone.base.interfaces import IImagingSchema
 from plone.base.interfaces import ILinkSchema
 from plone.base.interfaces import IPatternsSettings
@@ -137,15 +137,15 @@ def tinymce(self):
         server_url = self.request.get("SERVER_URL", "")
         site_path = portal_url[len(server_url) :]
 
-        related_items_config = get_relateditems_options(
+        contentbrowser_config = get_contentbrowser_options(
             context=self.context,
             value=None,
             separator=";",
             vocabulary_name="plone.app.vocabularies.Catalog",
             vocabulary_view="@@getVocabulary",
             field_name=None,
         )
-        related_items_config = call_callables(related_items_config, self.context)
+        contentbrowser_config = call_callables(contentbrowser_config, self.context)
 
         configuration = {
             "base_url": self.context.absolute_url(),
@@ -156,7 +156,7 @@ def tinymce(self):
             "pictureVariants": self.picture_variants,
             "imageCaptioningEnabled": self.image_captioning,
             "linkAttribute": "UID",
-            "relatedItems": related_items_config,
+            "relatedItems": contentbrowser_config,
             "prependToScalePart": "/@@images/image/",
             "prependToUrl": "{}/resolveuid/".format(site_path.rstrip("/")),
             "inline": settings.inline,

news/4133.bugfix

@@ -0,0 +1,3 @@
+Use contentbrowser options for TinyMCE image/link browser.
+This also fixes the basePath calculation for uploading.
+[petschki]