diff --git a/.travis.yml b/.travis.yml index 3eb8068c7..d54869445 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,14 +18,18 @@ env: - PLONE_VERSION=4.3 - PLONE_VERSION=4.3 DEXTERITY_ONLY=true - PLONE_VERSION=4.3 VERSIONS=versions:plone.app.jquery=1.9.2 + - PLONE_VERSION=4.3 WIDGETS=true BOOTSTRAP_PARAMS="--buildout-version=1.7.1 --setuptools-version=20.1.1" - PLONE_VERSION=5.0 - PLONE_VERSION=5.1 matrix: fast_finish: true + allow_failures: + - env: PLONE_VERSION=4.3 WIDGETS=true BOOTSTRAP_PARAMS="--buildout-version=1.7.1 --setuptools-version=20.1.1" install: - sed -ie "s#test-4.3#test-$PLONE_VERSION#" buildout.cfg - sed -ie "s#versions-4.3#versions-$PLONE_VERSION#" buildout.cfg -- python bootstrap.py +- test $WIDGETS && sed -ie "s#versions-4.3.x.cfg#versions-4.3.x-widgets.cfg#" buildout.cfg || true +- python bootstrap.py $BOOTSTRAP_PARAMS - bin/buildout $VERSIONS annotate - bin/buildout $VERSIONS before_script: @@ -55,5 +59,6 @@ notifications: - "Robot Test Report for Plone 4.3: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.1/parts/test/robot_log.html" - "Robot Test Report for plone.app.contenttypes: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.2/parts/test/robot_log.html" - "Robot Test Report for jQuery 1.9: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.3/parts/test/robot_log.html" - - "Robot Test Report for Plone 5.0: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.4/parts/test/robot_log.html" - - "Robot Test Report for Plone 5.1: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.5/parts/test/robot_log.html" + - "Robot Test Report for plone.app.widgets 1.x: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.4/parts/test/robot_log.html" + - "Robot Test Report for Plone 5.0: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.5/parts/test/robot_log.html" + - "Robot Test Report for Plone 5.1: http://s3-sa-east-1.amazonaws.com/collective-cover/collective/collective.cover/%{build_number}/%{build_number}.6/parts/test/robot_log.html" diff --git a/CHANGES.rst b/CHANGES.rst index 5a11bebbb..d02fcb47e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -6,7 +6,9 @@ There's a frood who really knows where his towel is. 1.6b2 (unreleased) ^^^^^^^^^^^^^^^^^^ -- Nothing changed yet. +- Fix Plone 4.3 with plone.app.widgets 1.x installed. The tile-edit forms are now opened + with .pat-plone-modal (fixes `#719`_) + [petschki] 1.6b1 (2017-06-23) @@ -232,5 +234,6 @@ Previous entries can be found in the HISTORY.rst file. .. _`#686`: https://github.com/collective/collective.cover/issues/686 .. _`#710`: https://github.com/collective/collective.cover/issues/710 .. _`#713`: https://github.com/collective/collective.cover/issues/713 +.. _`#719`: https://github.com/collective/collective.cover/issues/719 .. _`#721`: https://github.com/collective/collective.cover/issues/721 .. _`#727`: https://github.com/collective/collective.cover/issues/727 diff --git a/src/collective/cover/browser/layout.py b/src/collective/cover/browser/layout.py index 43827bf11..5e326bd99 100644 --- a/src/collective/cover/browser/layout.py +++ b/src/collective/cover/browser/layout.py @@ -137,8 +137,10 @@ def render_section(self, section, mode): elif section['type'] == u'group': return self.group(section=section, mode=mode) elif section['type'] == u'tile': - tile_url = '@@{0}/{1}'.format(section.get('tile-type'), - section.get('id')) + tile_url = '{0}/@@{1}/{2}'.format( + '/'.join(self.context.getPhysicalPath()), + section.get('tile-type'), + section.get('id')) tile = self.context.restrictedTraverse(tile_url.encode(), None) if tile is None: return '