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

[nobody at svn.erp5.org]

Author: thomas
Date: Tue Jun 13 17:54:48 2006
New Revision: 7710

URL: http://svn.erp5.org?rev=7710&view=rev
Log:
changes on Base.getProperty() suggested by Yo to fix bug while trying to get
a property from an attribute (setProperty is able to set such property on
attributes, but getProperty is unable to recover them).
This is done to add better support on tempObjects for generatig statistics over
Planning view

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=7710&r1=7709&r2=7710&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Tue Jun 13 17:54:48 2006
@@ -780,7 +780,8 @@
         return default_value
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' )
-  def getProperty(self, key, d=None, **kw):
+  _marker=[]
+  def getProperty(self, key, d=_marker, **kw):
     """
       Previous Name: getValue
 
@@ -801,7 +802,11 @@
       method = getattr(self, accessor_name)
       return method(**kw)
     else:
-      return ERP5PropertyManager.getProperty(self, key, d=d, **kw)
+      value = ERP5PropertyManager.getProperty(self, key, d=d, **kw)
+      if value is self._marker:
+	return getattr(self,key)
+      else:
+	return getattr(self,key,d)
 
   security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' )
   def getPropertyList(self, key, d=None):