From ca82ee60349529b5ba0c5d41e1b02149b27b5069 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Tue, 3 Jan 2006 11:12:09 +0000 Subject: [PATCH] Fix setId on modules containing objects with internal relations [PATCH 2/2]: (second part of the 2nd patch, local cvs right problem - sorry) Make FolderMixIn heritate from CopyContainer. Remove "CPS patch circumvent" now useless. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4995 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5Type/Document/Folder.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/product/ERP5Type/Document/Folder.py b/product/ERP5Type/Document/Folder.py index 154a3c8f02..5302d3ae40 100755 --- a/product/ERP5Type/Document/Folder.py +++ b/product/ERP5Type/Document/Folder.py @@ -30,7 +30,6 @@ from AccessControl import ClassSecurityInfo from Acquisition import aq_base, aq_self import ExtensionClass -from OFS.CopySupport import CopyContainer as OriginalCopyContainer from Products.CMFCore.utils import _getAuthenticatedUser from Products.ERP5Type.Base import Base @@ -55,7 +54,7 @@ def dummyFilter(object,REQUEST=None): def dummyTestAfter(object,REQUEST=None): return [] -class FolderMixIn(ExtensionClass.Base): +class FolderMixIn(ExtensionClass.Base, CopyContainer): # Declarative security security = ClassSecurityInfo() @@ -298,9 +297,6 @@ be a problem).""" _setPropValue = Base._setPropValue _propertyMap = Base._propertyMap # are there any others XXX ? - # CPS patch circumvent - manage_renameObject = OriginalCopyContainer.manage_renameObject - #security.declareProtected( Permissions.DeletePortalContent, 'manage_delObjects' ) #manage_delObjects = CopyContainer.manage_delObjects -- 2.30.9