diff --git a/last_commit.txt b/last_commit.txt index 1edef7e00c..7eb56d5104 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,204 +1,88 @@ -Repository: plone.app.portlets +Repository: Products.ATContentTypes Branch: refs/heads/master -Date: 2018-03-12T12:58:14-04:00 +Date: 2018-03-14T09:18:00-04:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.portlets/commit/1c6f33c16b3ffbdcc43c30e5dedd967fc37141bf +Commit: https://github.com/plone/Products.ATContentTypes/commit/abdbe74dd5dcecd5f3210ce3697575d654383398 -bump version since a 4.3.x branch was created +Handle no icon in folder_tabular_view Files changed: M CHANGES.rst -M setup.py +M Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt diff --git a/CHANGES.rst b/CHANGES.rst -index b4befba..6f8996d 100644 +index 615768db..3a20bb52 100644 --- a/CHANGES.rst +++ b/CHANGES.rst -@@ -2,7 +2,7 @@ Changelog - ========= +@@ -30,6 +30,9 @@ Bug fixes: + - Fix doctests to adapt to changes in http-headers. + [pbauer] - --4.3.2 (unreleased) -+4.4.0 (unreleased) - ------------------ - - Breaking changes: -@@ -17,6 +17,7 @@ Bug fixes: - - - Imports are Python3 compatible - [ale-rt] -+ - - base.Renderer no longer mixes in Acquisition.Explicit, - so attributes of the renderer will no longer be wrapped. - [davisagli] -diff --git a/setup.py b/setup.py -index aacab0a..89ff3e9 100644 ---- a/setup.py -+++ b/setup.py -@@ -3,7 +3,7 @@ - from setuptools import setup - - --version = '4.3.2.dev0' -+version = '4.4.0.dev0' - - setup( - name='plone.app.portlets', - - -Repository: plone.app.portlets - - -Branch: refs/heads/master -Date: 2018-03-12T12:58:42-04:00 -Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.portlets/commit/bdafe8116927a6cb8662aaa7e63b6f1d0b2d69ee - -also catch NotFound while traversing portlet add views - -Files changed: -M CHANGES.rst -M plone/app/portlets/browser/editmanager.py - -diff --git a/CHANGES.rst b/CHANGES.rst -index 6f8996d..098edfb 100644 ---- a/CHANGES.rst -+++ b/CHANGES.rst -@@ -22,6 +22,12 @@ Bug fixes: - so attributes of the renderer will no longer be wrapped. - [davisagli] - -+- Catch NotFound while trying to traverse to portlet add views -+ to check permission. ++- Handle no content icon in folder_tabular_view + [davisagli] + -+- *add item here* -+ - - 4.3.1 (2017-08-07) + 2.3.6 (2017-06-26) ------------------ -diff --git a/plone/app/portlets/browser/editmanager.py b/plone/app/portlets/browser/editmanager.py -index 20a779b..92f0d72 100644 ---- a/plone/app/portlets/browser/editmanager.py -+++ b/plone/app/portlets/browser/editmanager.py -@@ -24,6 +24,7 @@ - from Acquisition.interfaces import IAcquirer - - from AccessControl import Unauthorized -+from zExceptions import NotFound - - from Products.Five.browser import BrowserView - from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile -@@ -38,6 +39,7 @@ - - from plone.portlets.interfaces import IPortletAssignmentSettings - -+ - @implementer(IPortletManagerRenderer) - class EditPortletManagerRenderer(Explicit): - """Render a portlet manager in edit mode. -@@ -162,7 +164,7 @@ def check_permission(p): - addview = addview[1:] - try: - self.context.restrictedTraverse(str(addview)) -- except (AttributeError, KeyError, Unauthorized,): -+ except (AttributeError, KeyError, Unauthorized, NotFound): - return False - return True +diff --git a/Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt b/Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt +index 5b6ab848..042791d3 100644 +--- a/Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt ++++ b/Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt +@@ -43,7 +43,7 @@ + + +