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

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Mon Jan 31 21:58:54 2011
New Revision: 42849

URL: http://svn.erp5.org?rev=42849&view=rev
Log:
* disable _categories assignment as it seems to break non-migrated instances.
* aggregate all _categories values from accessor holders

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

Modified: erp5/trunk/products/ERP5Type/dynamic/lazy_class.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/dynamic/lazy_class.py?rev=42849&r1=42848&r2=42849&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dynamic/lazy_class.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/dynamic/lazy_class.py [utf8] Mon Jan 31 21:58:54 2011
@@ -237,7 +237,8 @@ class PortalTypeMetaClass(GhostBaseMetaC
       for key, value in attribute_dict.iteritems():
         setattr(klass, key, value)
 
-      klass._categories = base_category_list
+      # XXX disabled
+      #klass._categories = base_category_list
 
       for interface in interface_list:
         classImplements(klass, interface)

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=42849&r1=42848&r2=42849&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/dynamic/portal_type_class.py [utf8] Mon Jan 31 21:58:54 2011
@@ -287,6 +287,11 @@ def generatePortalTypeClass(site, portal
         erp5.accessor_holder,
         property_sheet_tool)
 
+      base_category_set = set(base_category_list)
+      for accessor_holder in accessor_holder_list:
+        base_category_set.update(accessor_holder._categories)
+      base_category_list = list(base_category_set)
+
     property_sheet_generating_portal_type_set.remove(portal_type_name)
 
   # LOG("ERP5Type.dynamic", INFO,