diff --git a/.gitignore b/.gitignore index abbc9b17..5bdc3fe9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ dist /lib* .*.swp pip-selfcheck.json +pyvenv.cfg diff --git a/bootstrap-buildout.py b/bootstrap-buildout.py deleted file mode 100644 index a4599211..00000000 --- a/bootstrap-buildout.py +++ /dev/null @@ -1,210 +0,0 @@ -############################################################################## -# -# Copyright (c) 2006 Zope Foundation and Contributors. -# All Rights Reserved. -# -# This software is subject to the provisions of the Zope Public License, -# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED -# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS -# FOR A PARTICULAR PURPOSE. -# -############################################################################## -"""Bootstrap a buildout-based project - -Simply run this script in a directory containing a buildout.cfg. -The script accepts buildout command-line options, so you can -use the -c option to specify an alternate configuration file. -""" - -import os -import shutil -import sys -import tempfile - -from optparse import OptionParser - -__version__ = '2015-07-01' -# See zc.buildout's changelog if this version is up to date. - -tmpeggs = tempfile.mkdtemp(prefix='bootstrap-') - -usage = '''\ -[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] - -Bootstraps a buildout-based project. - -Simply run this script in a directory containing a buildout.cfg, using the -Python that you want bin/buildout to use. - -Note that by using --find-links to point to local resources, you can keep -this script from going over the network. -''' - -parser = OptionParser(usage=usage) -parser.add_option("--version", - action="store_true", default=False, - help=("Return bootstrap.py version.")) -parser.add_option("-t", "--accept-buildout-test-releases", - dest='accept_buildout_test_releases', - action="store_true", default=False, - help=("Normally, if you do not specify a --version, the " - "bootstrap script and buildout gets the newest " - "*final* versions of zc.buildout and its recipes and " - "extensions for you. If you use this flag, " - "bootstrap and buildout will get the newest releases " - "even if they are alphas or betas.")) -parser.add_option("-c", "--config-file", - help=("Specify the path to the buildout configuration " - "file to be used.")) -parser.add_option("-f", "--find-links", - help=("Specify a URL to search for buildout releases")) -parser.add_option("--allow-site-packages", - action="store_true", default=False, - help=("Let bootstrap.py use existing site packages")) -parser.add_option("--buildout-version", - help="Use a specific zc.buildout version") -parser.add_option("--setuptools-version", - help="Use a specific setuptools version") -parser.add_option("--setuptools-to-dir", - help=("Allow for re-use of existing directory of " - "setuptools versions")) - -options, args = parser.parse_args() -if options.version: - print("bootstrap.py version %s" % __version__) - sys.exit(0) - - -###################################################################### -# load/install setuptools - -try: - from urllib.request import urlopen -except ImportError: - from urllib2 import urlopen - -ez = {} -if os.path.exists('ez_setup.py'): - exec(open('ez_setup.py').read(), ez) -else: - exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez) - -if not options.allow_site_packages: - # ez_setup imports site, which adds site packages - # this will remove them from the path to ensure that incompatible versions - # of setuptools are not in the path - import site - # inside a virtualenv, there is no 'getsitepackages'. - # We can't remove these reliably - if hasattr(site, 'getsitepackages'): - for sitepackage_path in site.getsitepackages(): - # Strip all site-packages directories from sys.path that - # are not sys.prefix; this is because on Windows - # sys.prefix is a site-package directory. - if sitepackage_path != sys.prefix: - sys.path[:] = [x for x in sys.path - if sitepackage_path not in x] - -setup_args = dict(to_dir=tmpeggs, download_delay=0) - -if options.setuptools_version is not None: - setup_args['version'] = options.setuptools_version -if options.setuptools_to_dir is not None: - setup_args['to_dir'] = options.setuptools_to_dir - -ez['use_setuptools'](**setup_args) -import setuptools -import pkg_resources - -# This does not (always?) update the default working set. We will -# do it. -for path in sys.path: - if path not in pkg_resources.working_set.entries: - pkg_resources.working_set.add_entry(path) - -###################################################################### -# Install buildout - -ws = pkg_resources.working_set - -setuptools_path = ws.find( - pkg_resources.Requirement.parse('setuptools')).location - -# Fix sys.path here as easy_install.pth added before PYTHONPATH -cmd = [sys.executable, '-c', - 'import sys; sys.path[0:0] = [%r]; ' % setuptools_path + - 'from setuptools.command.easy_install import main; main()', - '-mZqNxd', tmpeggs] - -find_links = os.environ.get( - 'bootstrap-testing-find-links', - options.find_links or - ('http://downloads.buildout.org/' - if options.accept_buildout_test_releases else None) - ) -if find_links: - cmd.extend(['-f', find_links]) - -requirement = 'zc.buildout' -version = options.buildout_version -if version is None and not options.accept_buildout_test_releases: - # Figure out the most recent final version of zc.buildout. - import setuptools.package_index - _final_parts = '*final-', '*final' - - def _final_version(parsed_version): - try: - return not parsed_version.is_prerelease - except AttributeError: - # Older setuptools - for part in parsed_version: - if (part[:1] == '*') and (part not in _final_parts): - return False - return True - - index = setuptools.package_index.PackageIndex( - search_path=[setuptools_path]) - if find_links: - index.add_find_links((find_links,)) - req = pkg_resources.Requirement.parse(requirement) - if index.obtain(req) is not None: - best = [] - bestv = None - for dist in index[req.project_name]: - distv = dist.parsed_version - if _final_version(distv): - if bestv is None or distv > bestv: - best = [dist] - bestv = distv - elif distv == bestv: - best.append(dist) - if best: - best.sort() - version = best[-1].version -if version: - requirement = '=='.join((requirement, version)) -cmd.append(requirement) - -import subprocess -if subprocess.call(cmd) != 0: - raise Exception( - "Failed to execute command:\n%s" % repr(cmd)[1:-1]) - -###################################################################### -# Import and run buildout - -ws.add_entry(tmpeggs) -ws.require(requirement) -import zc.buildout.buildout - -if not [a for a in args if '=' not in a]: - args.append('bootstrap') - -# if -c was provided, we push it back into args for buildout' main function -if options.config_file is not None: - args[0:0] = ['-c', options.config_file] - -zc.buildout.buildout.main(args) -shutil.rmtree(tmpeggs) diff --git a/buildout.cfg b/buildout.cfg index 92412b5b..c16b1dc4 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -1,7 +1,9 @@ [buildout] -extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.1.x.cfg +extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-5.2.x.cfg package-name = plone.app.z3cform package-extras = [tests] [versions] plone.app.z3cform = +zc.buildout = +plone.app.textfield = 1.3.6 diff --git a/news/multiple_editors.feature b/news/multiple_editors.feature new file mode 100644 index 00000000..c766deae --- /dev/null +++ b/news/multiple_editors.feature @@ -0,0 +1 @@ +Enable multiple wysiwyg editors (use default editor registry setting) [duchenean, gotcha] \ No newline at end of file diff --git a/plone/app/z3cform/configure.zcml b/plone/app/z3cform/configure.zcml index 7e2d5471..f7f92fb0 100644 --- a/plone/app/z3cform/configure.zcml +++ b/plone/app/z3cform/configure.zcml @@ -234,4 +234,10 @@ factory=".factories.Zope2FileUploadStorable" /> + + diff --git a/plone/app/z3cform/interfaces.py b/plone/app/z3cform/interfaces.py index b4e52d9b..07c9ad99 100644 --- a/plone/app/z3cform/interfaces.py +++ b/plone/app/z3cform/interfaces.py @@ -68,3 +68,7 @@ class ILinkWidget(ITextWidget): class ISingleCheckBoxBoolWidget(ISingleCheckBoxWidget): """Marker interface for the SingleCheckboxBoolWidget.""" + + +class IRichTextWidgetInputModeRenderer(Interface): + """Marker interface to render multiple wysiwyg editors""" diff --git a/plone/app/z3cform/tests/example.py b/plone/app/z3cform/tests/example.py index 3365f402..325ed4be 100644 --- a/plone/app/z3cform/tests/example.py +++ b/plone/app/z3cform/tests/example.py @@ -84,3 +84,7 @@ def handleApply(self, action): class MyMultiFormWrapper(FormWrapper): form = MyMultiForm + + +def dummy_richtextwidget_render(widget): + return "

dummy

" diff --git a/plone/app/z3cform/tests/test_widgets.py b/plone/app/z3cform/tests/test_widgets.py index 85915432..35f97e14 100644 --- a/plone/app/z3cform/tests/test_widgets.py +++ b/plone/app/z3cform/tests/test_widgets.py @@ -1671,6 +1671,30 @@ def test_dx_tinymcewidget_multiple_mimetypes_edit(self): ) self.assertTrue('pat-tinymce' not in rendered) + def test_use_default_editor_value(self): + """ Use dummy utility registered in testing.zcml """ + if IMarkupSchema: + # if not, don't run this test + self._set_mimetypes(allowed=('text/html',)) + registry = getUtility(IRegistry) + from Products.CMFPlone.interfaces import IEditingSchema + proxy = registry.forInterface(IEditingSchema, check=False, + prefix='plone') + proxy.available_editors = [u'dummy', u'TinyMCE'] + proxy.default_editor = u'dummy' + from plone.app.z3cform.widget import RichTextWidget + widget = FieldWidget(self.field, RichTextWidget(self.request)) + widget.context = self.portal + rendered = widget.render() + self.assertTrue('

dummy

' in rendered) + + proxy.default_editor = u'TinyMCE' + from plone.app.z3cform.widget import RichTextWidget + widget = FieldWidget(self.field, RichTextWidget(self.request)) + widget.context = self.portal + rendered = widget.render() + self.assertTrue('pat-tinymce' in rendered) + class LinkWidgetIntegrationTests(unittest.TestCase): diff --git a/plone/app/z3cform/tests/testing.zcml b/plone/app/z3cform/tests/testing.zcml index 0a630efd..22c27be3 100644 --- a/plone/app/z3cform/tests/testing.zcml +++ b/plone/app/z3cform/tests/testing.zcml @@ -22,4 +22,10 @@ class=".example.MyMultiFormWrapper" permission="zope.Public" /> + + diff --git a/plone/app/z3cform/widget.py b/plone/app/z3cform/widget.py index 18d1bdd8..bfda74fe 100644 --- a/plone/app/z3cform/widget.py +++ b/plone/app/z3cform/widget.py @@ -30,13 +30,13 @@ from plone.app.z3cform.interfaces import IQueryStringWidget from plone.app.z3cform.interfaces import IRelatedItemsWidget from plone.app.z3cform.interfaces import IRichTextWidget +from plone.app.z3cform.interfaces import IRichTextWidgetInputModeRenderer from plone.app.z3cform.interfaces import ISelectWidget from plone.app.z3cform.interfaces import ISingleCheckBoxBoolWidget from plone.app.z3cform.utils import call_callables from plone.app.z3cform.utils import closest_content from plone.registry.interfaces import IRegistry from Products.CMFCore.utils import getToolByName -from Products.CMFPlone.interfaces import IEditingSchema from Products.CMFPlone.utils import safe_unicode from six.moves import UserDict from z3c.form import interfaces as form_ifaces @@ -706,23 +706,7 @@ def pattern(self): """dynamically grab the actual pattern name so it will work with custom visual editors""" if self._pattern is None: - registry = getUtility(IRegistry) - try: - records = registry.forInterface(IEditingSchema, check=False, - prefix='plone') - default = records.default_editor.lower() - available = records.available_editors - except AttributeError: - default = 'tinymce' - available = ['TinyMCE'] - tool = getToolByName(self.wrapped_context(), 'portal_membership') - member = tool.getAuthenticatedMember() - editor = member.getProperty('wysiwyg_editor') - if editor in available: - self._pattern = editor.lower() - elif editor in ('None', None): - self._pattern = 'plaintexteditor' - return default + self._pattern = self.getWysiwygEditor() return self._pattern def _base_args(self): @@ -752,6 +736,22 @@ def render(self): :rtype: string """ if self.mode != 'display': + renderer = queryUtility( + IRichTextWidgetInputModeRenderer, + name=self.getWysiwygEditor(), + default=tinymce_richtextwidget_render + ) + return renderer(self) + + if not self.value: + return '' + + if isinstance(self.value, RichTextValue): + return self.value.output_relative_to(self.context) + + return super(RichTextWidget, self).render() + + def render_input_mode(self): # MODE "INPUT" rendered = '' allowed_mime_types = self.allowedMimeTypes() @@ -814,13 +814,9 @@ def render(self): ) return rendered - if not self.value: - return '' - - if isinstance(self.value, RichTextValue): - return self.value.output_relative_to(self.context) - return super(RichTextWidget, self).render() +def tinymce_richtextwidget_render(widget): + return RichTextWidget.render_input_mode(widget) @implementer_only(ILinkWidget) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..2cf3ea62 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +zc.buildout==3.0.0b4 diff --git a/setup.py b/setup.py index 650556d2..37a25375 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ def read(*rnames): zip_safe=False, install_requires=[ 'Acquisition', - 'plone.app.textfield', + 'plone.app.textfield>=1.3.6', 'plone.app.widgets>=2.4.2.dev0', 'plone.protect', 'plone.z3cform>=0.5.11dev',