[Erp5-report] r41180 nicolas.dumazet - /erp5/trunk/products/ERP5Type/ERP5Type.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Tue Dec  7 03:42:01 2010
New Revision: 41180

URL: http://svn.erp5.org?rev=41180&view=rev
Log:
revert 41179: committed wrong file, sorry

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

Modified: erp5/trunk/products/ERP5Type/ERP5Type.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/ERP5Type.py?rev=41180&r1=41179&r2=41180&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/ERP5Type.py [utf8] Tue Dec  7 03:42:01 2010
@@ -211,7 +211,6 @@ class ERP5TypeInformation(XMLObject,
 
     acquire_local_roles = False
     property_sheet_list = ()
-    zodb_property_sheet_list = ()
     base_category_list = ()
     init_script = ''
     product = 'ERP5Type'
@@ -347,6 +346,8 @@ class ERP5TypeInformation(XMLObject,
       ob = klass(id)
 
       if temp_object:
+        if id in (None, ''):
+          raise ValueError("invalid object id")
         ob = ob.__of__(container)
         for ignore in ('activate_kw', 'is_indexable', 'reindex_kw'):
           kw.pop(ignore, None)
@@ -375,10 +376,7 @@ class ERP5TypeInformation(XMLObject,
         #ob._setPortalTypeName(self.getId())
         # XXX rafael: if we use _set because it is trigger by interaction
         # workflow and it is annoyning without security setted
-        try:
-          ob.portal_type = self.getId()
-        except:
-          import pdb; pdb.set_trace()
+        ob.portal_type = self.getId()
 
       if not temp_object:
         # Do not reindex object because it's already done by manage_afterAdd
@@ -426,12 +424,6 @@ class ERP5TypeInformation(XMLObject,
       return list(self.property_sheet_list)
 
     security.declareProtected(Permissions.AccessContentsInformation,
-                              'getTypeZodbPropertySheetList')
-    def getTypeZodbPropertySheetList(self):
-      """Getter for 'zodb_type_property_sheet' property"""
-      return list(self.zodb_property_sheet_list)
-
-    security.declareProtected(Permissions.AccessContentsInformation,
                               'getTypeBaseCategoryList')
     def getTypeBaseCategoryList(self):
       """Getter for 'type_base_category' property"""