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

@@ -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