[Erp5-report] r13335 - /erp5/trunk/products/ERP5Type/Core/Folder.py

[nobody at svn.erp5.org]

Author: jp
Date: Mon Mar 12 11:05:29 2007
New Revision: 13335

URL: http://svn.erp5.org?rev=13335&view=rev
Log:
New __init__ method to make sure no title is defined by default on a folder. Removed PS XMLObject cause Folder is not an XMLObject.

Modified:
    erp5/trunk/products/ERP5Type/Core/Folder.py

Modified: erp5/trunk/products/ERP5Type/Core/Folder.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Core/Folder.py?rev=13335&r1=13334&r2=13335&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Core/Folder.py (original)
+++ erp5/trunk/products/ERP5Type/Core/Folder.py Mon Mar 12 11:05:29 2007
@@ -43,8 +43,10 @@
 
 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 @@
                    )
   # Declarative properties
   property_sheets = ( PropertySheet.Base
-                    , PropertySheet.XMLObject
                     , PropertySheet.SimpleItem
                     , PropertySheet.Folder
                     )
@@ -344,6 +345,13 @@
   _edit = Base._edit
   _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):