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

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Dec 22 06:56:10 2010
New Revision: 41638

URL: http://svn.erp5.org?rev=41638&view=rev
Log:
allow having strings in Document classes's property_sheets attributes, and make
sure that aq_dynamic will know where to find the property sheet

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

Modified: erp5/trunk/products/ERP5Type/Base.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Base.py?rev=41638&r1=41637&r2=41638&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Base.py [utf8] Wed Dec 22 06:56:10 2010
@@ -581,7 +581,13 @@ def initializePortalTypeDynamicPropertie
       # have been migrated. This is kept for backward compatility with
       # the filesystem Property Sheet (see ERP5Type.dynamic.portal_type_class)
       if isinstance(base, basestring):
-        continue
+        # The property Sheet might be in ERP5PropertySheetLegacy,
+        # give it a try. If it's not there, no need to warn or log
+        # heavily: it just means that it will be a ZODB propertysheet
+        from Products.ERP5Type import PropertySheet
+        base = getattr(PropertySheet, base)
+        if isinstance(base, basestring):
+          continue
 
       for list_name, current_list in ps_definition_dict.items():
         try: