From fc73fe94438413b5a430985af744981b2aeff8f1 Mon Sep 17 00:00:00 2001
From: Jean-Paul Smets <jp@nexedi.com>
Date: Mon, 12 Mar 2007 10:05:29 +0000
Subject: [PATCH] New __init__ method to make sure no title is defined by
 default on a folder. Removed PS XMLObject cause Folder is not an XMLObject.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@13335 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/ERP5Type/Core/Folder.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/product/ERP5Type/Core/Folder.py b/product/ERP5Type/Core/Folder.py
index d8e72d4446..9b640ba4e7 100644
--- a/product/ERP5Type/Core/Folder.py
+++ b/product/ERP5Type/Core/Folder.py
@@ -43,8 +43,10 @@ from Products.ERP5Type.Utils import sortValueList
 
 try:
   from Products.CMFCore.CMFBTreeFolder import CMFBTreeFolder
+  from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
 except ImportError:
   from Products.BTreeFolder2.CMFBTreeFolder import CMFBTreeFolder
+  from Products.BTreeFolder2.BTreeFolder2 import BTreeFolder2Base
 from AccessControl import getSecurityManager
 from Products.ERP5Type import Permissions
 from random import randint
@@ -332,7 +334,6 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn):
                    )
   # Declarative properties
   property_sheets = ( PropertySheet.Base
-                    , PropertySheet.XMLObject
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
                     )
@@ -345,6 +346,13 @@ class Folder( CopyContainer, CMFBTreeFolder, Base, FolderMixIn):
   _setPropValue = Base._setPropValue
   _propertyMap = Base._propertyMap # are there any others XXX ?
 
+
+  # Overload __init__ so that we do not take into account title
+  # This is required for test_23_titleIsNotDefinedByDefault
+  def __init__(self, id):
+    self.id = id
+    BTreeFolder2Base.__init__(self, id)
+
   # Override Zope default by folder id generation
   def _get_id(self, id):
     if self._getOb(id, None) is None :
-- 
2.30.9