[Testbot] Plone 5.0 - Python 2.7 - Build # 1430 - Fixed! - 0 failure(s)
jenkins at plone.org
jenkins at plone.org
Tue Feb 11 13:44:22 UTC 2014
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1430 - Fixed!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1430/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-11T04:57:14-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.widgets/commit/8c05d6efbacd44bdc2447457208a9ee050b20fac
Add sphinx-based documentation.
Files changed:
A docs/Makefile
A docs/doctrees/environment.pickle
A docs/doctrees/index.doctree
A docs/source/conf.py
A docs/source/index.rst
A sphinx.cfg
M .gitignore
M develop.cfg
diff --git a/.gitignore b/.gitignore
index 62cd80d..8e5d323 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@
/plone.app.vocabularies
/sauce_connect.log
/var/
+/docs/html/
+/docs/doctrees/
diff --git a/develop.cfg b/develop.cfg
index c8f25de..b13970f 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -1,9 +1,11 @@
[buildout]
extends =
http://dist.plone.org/release/4.3-latest/versions.cfg
+ sphinx.cfg
versions.cfg
+
versions = versions
-parts =
+parts +=
instance
test
develop = .
diff --git a/docs/Makefile b/docs/Makefile
new file mode 100644
index 0000000..3f559f6
--- /dev/null
+++ b/docs/Makefile
@@ -0,0 +1,159 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = /home/timo/workspace/plone/buildout.coredev-5.0-plip13787-main-template/src/plone.app.widgets/bin/sphinx-build
+PAPER =
+BUILDDIR = /home/timo/workspace/plone/buildout.coredev-5.0-plip13787-main-template/src/plone.app.widgets/docs
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) /home/timo/workspace/plone/buildout.coredev-5.0-plip13787-main-template/src/plone.app.widgets/docs/source
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) /home/timo/workspace/plone/buildout.coredev-5.0-plip13787-main-template/src/plone.app.widgets/docs/source
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " warnings-html to make standalone HTML files (warnings become errors)"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+warnings-html:
+ $(SPHINXBUILD) -W -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/sphinxbuilder.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/sphinxbuilder.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $HOME/.local/share/devhelp/sphinxbuilder"
+ @echo "# ln -s $(BUILDDIR)/devhelp $HOME/.local/share/devhelp/sphinxbuilder"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
diff --git a/docs/doctrees/environment.pickle b/docs/doctrees/environment.pickle
new file mode 100644
index 0000000..1e2fb98
Binary files /dev/null and b/docs/doctrees/environment.pickle differ
diff --git a/docs/doctrees/index.doctree b/docs/doctrees/index.doctree
new file mode 100644
index 0000000..02764dd
Binary files /dev/null and b/docs/doctrees/index.doctree differ
diff --git a/docs/source/conf.py b/docs/source/conf.py
new file mode 100644
index 0000000..e286c69
--- /dev/null
+++ b/docs/source/conf.py
@@ -0,0 +1,242 @@
+# -*- coding: utf-8 -*-
+#
+# plone.app.widgets documentation build configuration file, created by
+# sphinx-quickstart on Tue Feb 11 12:03:17 2014.
+#
+# This file is execfile()d with the current directory set to its containing dir.
+#
+# Note that not all possible configuration values are present in this
+# autogenerated file.
+#
+# All configuration values have a default; values that are commented out
+# serve to show the default.
+
+import sys, os
+
+# If extensions (or modules to document with autodoc) are in another directory,
+# add these directories to sys.path here. If the directory is relative to the
+# documentation root, use os.path.abspath to make it absolute, like shown here.
+#sys.path.insert(0, os.path.abspath('.'))
+
+# -- General configuration -----------------------------------------------------
+
+# If your documentation needs a minimal Sphinx version, state it here.
+#needs_sphinx = '1.0'
+
+# Add any Sphinx extension module names here, as strings. They can be extensions
+# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+extensions = []
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
+
+# The suffix of source filenames.
+source_suffix = '.rst'
+
+# The encoding of source files.
+#source_encoding = 'utf-8-sig'
+
+# The master toctree document.
+master_doc = 'index'
+
+# General information about the project.
+project = u'plone.app.widgets'
+copyright = u'2014, Timo Stollenwerk'
+
+# The version info for the project you're documenting, acts as replacement for
+# |version| and |release|, also used in various other places throughout the
+# built documents.
+#
+# The short X.Y version.
+version = '1.0'
+# The full version, including alpha/beta/rc tags.
+release = '1.0'
+
+# The language for content autogenerated by Sphinx. Refer to documentation
+# for a list of supported languages.
+#language = None
+
+# There are two options for replacing |today|: either, you set today to some
+# non-false value, then it is used:
+#today = ''
+# Else, today_fmt is used as the format for a strftime call.
+#today_fmt = '%B %d, %Y'
+
+# List of patterns, relative to source directory, that match files and
+# directories to ignore when looking for source files.
+exclude_patterns = []
+
+# The reST default role (used for this markup: `text`) to use for all documents.
+#default_role = None
+
+# If true, '()' will be appended to :func: etc. cross-reference text.
+#add_function_parentheses = True
+
+# If true, the current module name will be prepended to all description
+# unit titles (such as .. function::).
+#add_module_names = True
+
+# If true, sectionauthor and moduleauthor directives will be shown in the
+# output. They are ignored by default.
+#show_authors = False
+
+# The name of the Pygments (syntax highlighting) style to use.
+pygments_style = 'sphinx'
+
+# A list of ignored prefixes for module index sorting.
+#modindex_common_prefix = []
+
+
+# -- Options for HTML output ---------------------------------------------------
+
+# The theme to use for HTML and HTML Help pages. See the documentation for
+# a list of builtin themes.
+html_theme = 'default'
+
+# Theme options are theme-specific and customize the look and feel of a theme
+# further. For a list of options available for each theme, see the
+# documentation.
+#html_theme_options = {}
+
+# Add any paths that contain custom themes here, relative to this directory.
+#html_theme_path = []
+
+# The name for this set of Sphinx documents. If None, it defaults to
+# "<project> v<release> documentation".
+#html_title = None
+
+# A shorter title for the navigation bar. Default is the same as html_title.
+#html_short_title = None
+
+# The name of an image file (relative to this directory) to place at the top
+# of the sidebar.
+#html_logo = None
+
+# The name of an image file (within the static path) to use as favicon of the
+# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
+# pixels large.
+#html_favicon = None
+
+# Add any paths that contain custom static files (such as style sheets) here,
+# relative to this directory. They are copied after the builtin static files,
+# so a file named "default.css" will overwrite the builtin "default.css".
+html_static_path = ['_static']
+
+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+# using the given strftime format.
+#html_last_updated_fmt = '%b %d, %Y'
+
+# If true, SmartyPants will be used to convert quotes and dashes to
+# typographically correct entities.
+#html_use_smartypants = True
+
+# Custom sidebar templates, maps document names to template names.
+#html_sidebars = {}
+
+# Additional templates that should be rendered to pages, maps page names to
+# template names.
+#html_additional_pages = {}
+
+# If false, no module index is generated.
+#html_domain_indices = True
+
+# If false, no index is generated.
+#html_use_index = True
+
+# If true, the index is split into individual pages for each letter.
+#html_split_index = False
+
+# If true, links to the reST sources are added to the pages.
+#html_show_sourcelink = True
+
+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
+#html_show_sphinx = True
+
+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
+#html_show_copyright = True
+
+# If true, an OpenSearch description file will be output, and all pages will
+# contain a <link> tag referring to it. The value of this option must be the
+# base URL from which the finished HTML is served.
+#html_use_opensearch = ''
+
+# This is the file name suffix for HTML files (e.g. ".xhtml").
+#html_file_suffix = None
+
+# Output file base name for HTML help builder.
+htmlhelp_basename = 'ploneappwidgetsdoc'
+
+
+# -- Options for LaTeX output --------------------------------------------------
+
+latex_elements = {
+# The paper size ('letterpaper' or 'a4paper').
+#'papersize': 'letterpaper',
+
+# The font size ('10pt', '11pt' or '12pt').
+#'pointsize': '10pt',
+
+# Additional stuff for the LaTeX preamble.
+#'preamble': '',
+}
+
+# Grouping the document tree into LaTeX files. List of tuples
+# (source start file, target name, title, author, documentclass [howto/manual]).
+latex_documents = [
+ ('index', 'ploneappwidgets.tex', u'plone.app.widgets Documentation',
+ u'Timo Stollenwerk', 'manual'),
+]
+
+# The name of an image file (relative to this directory) to place at the top of
+# the title page.
+#latex_logo = None
+
+# For "manual" documents, if this is true, then toplevel headings are parts,
+# not chapters.
+#latex_use_parts = False
+
+# If true, show page references after internal links.
+#latex_show_pagerefs = False
+
+# If true, show URL addresses after external links.
+#latex_show_urls = False
+
+# Documents to append as an appendix to all manuals.
+#latex_appendices = []
+
+# If false, no module index is generated.
+#latex_domain_indices = True
+
+
+# -- Options for manual page output --------------------------------------------
+
+# One entry per manual page. List of tuples
+# (source start file, name, description, authors, manual section).
+man_pages = [
+ ('index', 'ploneappwidgets', u'plone.app.widgets Documentation',
+ [u'Timo Stollenwerk'], 1)
+]
+
+# If true, show URL addresses after external links.
+#man_show_urls = False
+
+
+# -- Options for Texinfo output ------------------------------------------------
+
+# Grouping the document tree into Texinfo files. List of tuples
+# (source start file, target name, title, author,
+# dir menu entry, description, category)
+texinfo_documents = [
+ ('index', 'ploneappwidgets', u'plone.app.widgets Documentation',
+ u'Timo Stollenwerk', 'ploneappwidgets', 'One line description of project.',
+ 'Miscellaneous'),
+]
+
+# Documents to append as an appendix to all manuals.
+#texinfo_appendices = []
+
+# If false, no module index is generated.
+#texinfo_domain_indices = True
+
+# How to display URL addresses: 'footnote', 'no', or 'inline'.
+#texinfo_show_urls = 'footnote'
diff --git a/docs/source/index.rst b/docs/source/index.rst
new file mode 100644
index 0000000..f341444
--- /dev/null
+++ b/docs/source/index.rst
@@ -0,0 +1,22 @@
+.. plone.app.widgets documentation master file, created by
+ sphinx-quickstart on Tue Feb 11 12:03:17 2014.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+Welcome to plone.app.widgets's documentation!
+=============================================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/sphinx.cfg b/sphinx.cfg
new file mode 100644
index 0000000..7715afd
--- /dev/null
+++ b/sphinx.cfg
@@ -0,0 +1,32 @@
+[buildout]
+parts +=
+ zopepy
+ sphinxbuilder
+ sphinxupload
+
+versions=versions
+
+[zopepy]
+recipe = zc.recipe.egg
+eggs = ${instance:eggs}
+interpreter = zopepy
+scripts = zopepy
+
+[sphinxbuilder]
+recipe = collective.recipe.sphinxbuilder
+#eggs = sphinxcontrib-robotdoc
+#outputs =
+# html
+# latex
+# pdf
+
+[sphinxupload]
+recipe = collective.recipe.template
+input = inline:
+ #!/bin/sh
+ bin/zopepy setup.py upload_sphinx
+output = ${buildout:directory}/bin/sphinxupload
+mode = 755
+
+[versions]
+pygments = 1.6
Repository: plone.app.widgets
Branch: refs/heads/master
Date: 2014-02-11T04:57:30-08:00
Author: tisto (tisto) <tisto at plone.org>
Commit: https://github.com/plone/plone.app.widgets/commit/d8c7daebe43bae284ef143d717b40cfb142e2900
Merge branch 'master' of git://github.com/plone/plone.app.widgets
Files changed:
A plone/app/widgets/browser/at_widget.py
A plone/app/widgets/browser/patterns_widget.pt
M plone/app/widgets/browser/configure.zcml
M plone/app/widgets/browser/file.py
M plone/app/widgets/dx.py
M plone/app/widgets/tests/test_dx.py
M plone/app/widgets/utils.py
D plone/app/widgets/skins/plone_widgets/patterns_widget.pt
diff --git a/plone/app/widgets/browser/at_widget.py b/plone/app/widgets/browser/at_widget.py
new file mode 100644
index 0000000..e8d8f68
--- /dev/null
+++ b/plone/app/widgets/browser/at_widget.py
@@ -0,0 +1,8 @@
+from Products.Five import BrowserView
+
+
+class PatternsWidgetMacros(BrowserView):
+
+ @property
+ def macros(self):
+ return self.index.macros
diff --git a/plone/app/widgets/browser/configure.zcml b/plone/app/widgets/browser/configure.zcml
index 0a3fb13..50d6188 100644
--- a/plone/app/widgets/browser/configure.zcml
+++ b/plone/app/widgets/browser/configure.zcml
@@ -3,6 +3,7 @@
xmlns:browser="http://namespaces.zope.org/browser"
xmlns:plone="http://namespaces.plone.org/plone"
xmlns:i18n="http://namespaces.zope.org/i18n"
+ xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="plone.app.widgets">
<browser:page
@@ -29,4 +30,13 @@
layer="..interfaces.IWidgetsLayer"
/>
+ <browser:page
+ zcml:condition="installed Products.Archetypes"
+ name="patterns_widget"
+ for="Products.Archetypes.interfaces.IBaseObject"
+ class=".at_widget.PatternsWidgetMacros"
+ template="patterns_widget.pt"
+ permission="zope.Public"
+ />
+
</configure>
diff --git a/plone/app/widgets/browser/file.py b/plone/app/widgets/browser/file.py
index fd8f3c9..9d563ac 100644
--- a/plone/app/widgets/browser/file.py
+++ b/plone/app/widgets/browser/file.py
@@ -29,7 +29,7 @@ def _tus_int(val):
try:
return int(val)
except:
- return 60*60 # default here...
+ return 60 * 60 # default here...
possible_tus_options = {
@@ -68,7 +68,10 @@ def _tus_int(val):
else:
try:
import tus
+ tus # pyflakes
except ImportError:
+ pass
+ else:
logger.warn('You have the tus python package installed but it is '
'not configured for this plone client')
diff --git a/plone/app/widgets/browser/patterns_widget.pt b/plone/app/widgets/browser/patterns_widget.pt
new file mode 100644
index 0000000..39d0535
--- /dev/null
+++ b/plone/app/widgets/browser/patterns_widget.pt
@@ -0,0 +1,29 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal"
+ xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+ i18n:domain="plone">
+
+<head><title></title></head>
+
+<body>
+
+ <metal:view_macro define-macro="view">
+ <div tal:attributes="id string:parent-fieldname-$fieldName-${context/UID|nothing}"
+ tal:content="structure python:widget.view(context, field, request)"></div>
+ </metal:view_macro>
+
+ <metal:define define-macro="edit">
+ <metal:use use-macro="field_macro | context/widgets/field/macros/edit">
+ <metal:fill fill-slot="widget_body">
+ <div tal:replace="structure python:widget.edit(context, field, request)"></div>
+ </metal:fill>
+ </metal:use>
+ </metal:define>
+
+<metal:define define-macro="search">
+ <div metal:use-macro="context/widgets_calendar/macros/edit"></div>
+</metal:define>
+
+</body>
+</html>
diff --git a/plone/app/widgets/dx.py b/plone/app/widgets/dx.py
index bd033fb..202d55e 100644
--- a/plone/app/widgets/dx.py
+++ b/plone/app/widgets/dx.py
@@ -50,6 +50,7 @@
from zope.interface import implements
from zope.interface import implementsOnly
from zope.publisher.browser import TestRequest
+from zope.schema.interfaces import IChoice
from zope.schema.interfaces import ICollection
from zope.schema.interfaces import IDate
from zope.schema.interfaces import IDatetime
@@ -656,6 +657,8 @@ def _base_args(self):
args['value'] = self.value
args.setdefault('pattern_options', {})
+ if IChoice.providedBy(self.field):
+ args['pattern_options']['maximumSelectionSize'] = 1
field_name = self.field and self.field.__name__ or None
args['pattern_options'] = dict_merge(
get_relateditems_options(self.context, args['value'],
diff --git a/plone/app/widgets/skins/plone_widgets/patterns_widget.pt b/plone/app/widgets/skins/plone_widgets/patterns_widget.pt
deleted file mode 100644
index 39d0535..0000000
--- a/plone/app/widgets/skins/plone_widgets/patterns_widget.pt
+++ /dev/null
@@ -1,29 +0,0 @@
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- xmlns:i18n="http://xml.zope.org/namespaces/i18n"
- i18n:domain="plone">
-
-<head><title></title></head>
-
-<body>
-
- <metal:view_macro define-macro="view">
- <div tal:attributes="id string:parent-fieldname-$fieldName-${context/UID|nothing}"
- tal:content="structure python:widget.view(context, field, request)"></div>
- </metal:view_macro>
-
- <metal:define define-macro="edit">
- <metal:use use-macro="field_macro | context/widgets/field/macros/edit">
- <metal:fill fill-slot="widget_body">
- <div tal:replace="structure python:widget.edit(context, field, request)"></div>
- </metal:fill>
- </metal:use>
- </metal:define>
-
-<metal:define define-macro="search">
- <div metal:use-macro="context/widgets_calendar/macros/edit"></div>
-</metal:define>
-
-</body>
-</html>
diff --git a/plone/app/widgets/tests/test_dx.py b/plone/app/widgets/tests/test_dx.py
index b58064a..51156fe 100644
--- a/plone/app/widgets/tests/test_dx.py
+++ b/plone/app/widgets/tests/test_dx.py
@@ -803,6 +803,42 @@ def test_widget(self):
widget._base_args()
)
+ def test_single_selection(self):
+ """The pattern_options value for maximumSelectionSize should
+ be 1 when the field only allows a single selection."""
+ from plone.app.widgets.dx import RelatedItemsFieldWidget
+ context = Mock(absolute_url=lambda: 'fake_url')
+ context.portal_properties.site_properties\
+ .getProperty.return_value = ['SomeType']
+ field = Choice(
+ __name__='selectfield',
+ values=['one', 'two', 'three'],
+ )
+ widget = RelatedItemsFieldWidget(field, self.request)
+ widget.context = context
+ widget.update()
+ base_args = widget._base_args()
+ pattern_options = base_args['pattern_options']
+ self.assertEquals(pattern_options.get('maximumSelectionSize', 0), 1)
+
+ def test_multiple_selection(self):
+ """The pattern_options key maximumSelectionSize shouldn't be
+ set when the field allows multiple selections"""
+ from plone.app.widgets.dx import RelatedItemsFieldWidget
+ context = Mock(absolute_url=lambda: 'fake_url')
+ context.portal_properties.site_properties\
+ .getProperty.return_value = ['SomeType']
+ field = List(
+ __name__='selectfield',
+ value_type=Choice(values=['one', 'two', 'three'])
+ )
+ widget = RelatedItemsFieldWidget(field, self.request)
+ widget.context = context
+ widget.update()
+ base_args = widget._base_args()
+ patterns_options = base_args['pattern_options']
+ self.assertFalse('maximumSelectionSize' in patterns_options)
+
def add_mock_fti(portal):
# Fake DX Type
diff --git a/plone/app/widgets/utils.py b/plone/app/widgets/utils.py
index 8aa80ca..d86d0e5 100644
--- a/plone/app/widgets/utils.py
+++ b/plone/app/widgets/utils.py
@@ -174,6 +174,7 @@ def get_tinymce_options(context, field, request):
}
return args
+
def get_portal():
closest_site = getSite()
if closest_site is not None:
-------------------------------------------------------------------------------
More information about the Testbot
mailing list