-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: Products.ATContentTypes
Branch: refs/heads/master Date: 2018-03-14T09:18:00-04:00 Author: David Glick (davisagli) <david@glicksoftware.com> Commit: plone/Products.ATContentTypes@abdbe74 Handle no icon in folder_tabular_view Files changed: M CHANGES.rst M Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt Repository: Products.ATContentTypes Branch: refs/heads/master Date: 2018-03-14T16:00:07+01:00 Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> Commit: plone/Products.ATContentTypes@2e6a349 Merge pull request #53 from plone/davisagli-tabular-view-master Handle no icon in folder_tabular_view (master) Files changed: M CHANGES.rst M Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt
- Loading branch information
Showing
1 changed file
with
50 additions
and
166 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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) <david@glicksoftware.com> | ||
| 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) <david@glicksoftware.com> | ||
| 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 @@ | ||
| <td> | ||
| <img width="16" height="16" | ||
| src="" alt="" | ||
| - tal:condition="item_icon/url" | ||
| + tal:condition="item_icon/url|nothing" | ||
| tal:attributes="src item_icon/url; | ||
| alt item_icon/description; | ||
| title item_icon/title; | ||
|
|
||
|
|
||
| Repository: plone.app.portlets | ||
| Repository: Products.ATContentTypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-03-12T14:34:44-04:00 | ||
| Author: David Glick (davisagli) <david.glick@plone.org> | ||
| Commit: https://github.com/plone/plone.app.portlets/commit/713e27e7dc5a05c96c03b9d7692531d997d92ac4 | ||
| Date: 2018-03-14T16:00:07+01:00 | ||
| Author: Gil Forcada Codinachs (gforcada) <gil.gnome@gmail.com> | ||
| Commit: https://github.com/plone/Products.ATContentTypes/commit/2e6a3490efcc495d3ec383d1fbc79679dc4b9c8a | ||
|
|
||
| Merge pull request #109 from plone/davisagli-traversal-master | ||
| Merge pull request #53 from plone/davisagli-tabular-view-master | ||
|
|
||
| Also catch NotFound while traversing portlet add views | ||
| Handle no icon in folder_tabular_view (master) | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M plone/app/portlets/browser/editmanager.py | ||
| M setup.py | ||
| M Products/ATContentTypes/skins/ATContentTypes/folder_tabular_view.pt | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index b4befba..098edfb 100644 | ||
| index 615768db..3a20bb52 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -2,7 +2,7 @@ Changelog | ||
| ========= | ||
|
|
||
|
|
||
| -4.3.2 (unreleased) | ||
| +4.4.0 (unreleased) | ||
| ------------------ | ||
|
|
||
| Breaking changes: | ||
| @@ -17,10 +17,17 @@ Bug fixes: | ||
| @@ -30,6 +30,9 @@ Bug fixes: | ||
| - Fix doctests to adapt to changes in http-headers. | ||
| [pbauer] | ||
|
|
||
| - 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] | ||
|
|
||
| +- 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/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', | ||
| 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 @@ | ||
| <td> | ||
| <img width="16" height="16" | ||
| src="" alt="" | ||
| - tal:condition="item_icon/url" | ||
| + tal:condition="item_icon/url|nothing" | ||
| tal:attributes="src item_icon/url; | ||
| alt item_icon/description; | ||
| title item_icon/title; | ||
|
|
||
|
|