From 57ed4a9a43d5a9fa9d376ea269964c1ce26f9a0d Mon Sep 17 00:00:00 2001 From: akshat2jain Date: Sun, 3 Sep 2023 19:55:53 +0530 Subject: [PATCH 1/5] undo icontentish interface --- Products/CMFPlone/Portal.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Products/CMFPlone/Portal.py b/Products/CMFPlone/Portal.py index 570e80c24f..c63110deff 100644 --- a/Products/CMFPlone/Portal.py +++ b/Products/CMFPlone/Portal.py @@ -222,8 +222,7 @@ def isEffective(self, date): return 1 -# Remove the IContentish interface so we don't listen to events that won't -# apply to the site root, ie handleUidAnnotationEvent -classImplementsOnly(PloneSite, implementedBy(PloneSite) - IContentish) +# Add the IContentish interface back to the PloneSite class +classImplementsOnly(PloneSite, implementedBy(PloneSite) + IContentish) InitializeClass(PloneSite) From d563b34aff47f37261912a4f52e1fbf340cb6dd7 Mon Sep 17 00:00:00 2001 From: akshat2jain Date: Sun, 3 Sep 2023 19:58:57 +0530 Subject: [PATCH 2/5] added log file --- news/3833.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/3833.bugfix diff --git a/news/3833.bugfix b/news/3833.bugfix new file mode 100644 index 0000000000..c70585a99a --- /dev/null +++ b/news/3833.bugfix @@ -0,0 +1 @@ +undo IContentish interface.@Akshat2Jain \ No newline at end of file From 23b202288445953c8a87eb54c4b178ac8e3cca88 Mon Sep 17 00:00:00 2001 From: akshat2jain Date: Mon, 4 Sep 2023 10:41:26 +0530 Subject: [PATCH 3/5] removed the class --- Products/CMFPlone/Portal.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Products/CMFPlone/Portal.py b/Products/CMFPlone/Portal.py index c63110deff..2b93d8de02 100644 --- a/Products/CMFPlone/Portal.py +++ b/Products/CMFPlone/Portal.py @@ -221,8 +221,4 @@ def isEffective(self, date): # Override DefaultDublinCoreImpl's test, since we are always viewable. return 1 - -# Add the IContentish interface back to the PloneSite class -classImplementsOnly(PloneSite, implementedBy(PloneSite) + IContentish) - InitializeClass(PloneSite) From c91e44b2d3b54b5530bc6cf94b5859f56d7f4e8e Mon Sep 17 00:00:00 2001 From: Roel Bruggink Date: Fri, 20 Oct 2023 14:33:46 +0200 Subject: [PATCH 4/5] Update 3833.bugfix --- news/3833.bugfix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/3833.bugfix b/news/3833.bugfix index c70585a99a..d299575e40 100644 --- a/news/3833.bugfix +++ b/news/3833.bugfix @@ -1 +1 @@ -undo IContentish interface.@Akshat2Jain \ No newline at end of file +Make PloneSite have IContentish again. @Akshat2Jain @jaroel From 8a08ea394bb73e1a04a8063605f0edd2d4ba00c1 Mon Sep 17 00:00:00 2001 From: Roel Bruggink Date: Fri, 20 Oct 2023 18:14:32 +0200 Subject: [PATCH 5/5] cleanup --- Products/CMFPlone/Portal.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Products/CMFPlone/Portal.py b/Products/CMFPlone/Portal.py index 2b93d8de02..cbf4c91149 100644 --- a/Products/CMFPlone/Portal.py +++ b/Products/CMFPlone/Portal.py @@ -15,7 +15,6 @@ from plone.base.permissions import View from plone.dexterity.content import Container from Products.CMFCore import permissions -from Products.CMFCore.interfaces import IContentish from Products.CMFCore.interfaces import ISiteRoot from Products.CMFCore.permissions import AccessContentsInformation from Products.CMFCore.permissions import AddPortalMember @@ -32,8 +31,6 @@ from Products.CMFPlone import bbb from Products.Five.component.interfaces import IObjectManagerSite from zope.event import notify -from zope.interface import classImplementsOnly -from zope.interface import implementedBy from zope.interface import implementer from zope.interface.interfaces import ComponentLookupError from zope.traversing.interfaces import BeforeTraverseEvent @@ -221,4 +218,5 @@ def isEffective(self, date): # Override DefaultDublinCoreImpl's test, since we are always viewable. return 1 + InitializeClass(PloneSite)