[Erp5-report] r42017 nicolas.dumazet - /erp5/trunk/products/ERP5Type/dynamic/

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Wed Jan  5 09:14:09 2011
New Revision: 42017

URL: http://svn.erp5.org?rev=42017&view=rev
Log:
if the property sheet exists in both the filesystem and ZODB, zodb should take over

(CMFActivity PropertySheet's might stay on the filesystem?)

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

Modified: erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py?rev=42017&r1=42016&r2=42017&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] Wed Jan  5 09:14:09 2011
@@ -265,10 +265,10 @@ def generatePortalTypeClass(portal_type_
         #
         # NOTE: The Property Sheets of a document should be given as a
         #       string from now on
-        if isinstance(property_sheet, basestring) and \
-          property_sheet in zodb_property_sheet_set:
-          property_sheet_name = property_sheet
-          property_sheet_set.add(property_sheet_name)
+        if not isinstance(property_sheet, basestring):
+          property_sheet = property_sheet.__name__
+        if property_sheet in zodb_property_sheet_set:
+          property_sheet_set.add(property_sheet)
 
     import erp5