[Erp5-report] r9610 - /erp5/trunk/products/ERP5Type/Base.py

[nobody at svn.erp5.org]

Author: jerome
Date: Fri Sep  1 14:52:42 2006
New Revision: 9610

URL: http://svn.erp5.org?rev=9610&view=rev
Log:
take into account class _properties in propertyMap()

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=9610&r1=9609&r2=9610&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Fri Sep  1 14:52:42 2006
@@ -396,12 +396,11 @@
   def _propertyMap(self):
     """ Method overload - properties are now defined on the ptype """
     ptype = self.portal_type
-    #LOG('_propertyMap',0,ptype)
     self._aq_dynamic('id') # Make sure aq_dynamic has been called once
     if Base.aq_portal_type.has_key(ptype):
-      #LOG('_propertyMap ptype',0,list(getattr(aq_portal_type[ptype], '_properties', ())))
       return tuple(list(getattr(Base.aq_portal_type[ptype], '_properties', ())) +
-                   list(getattr(self, '_local_properties', ())))
+                   list(getattr(self, '_local_properties', ())) +
+                   list(ERP5PropertyManager._propertyMap(self)))
     return ERP5PropertyManager._propertyMap(self)
 
   def _aq_dynamic_pmethod(self, id):