Commit cb8cc4f9 authored by Thomas Bernard's avatar Thomas Bernard

Last commited patch 7710 seems to generate errors in a lot of cases.

comming back to previous release as it should not be a good idea to be
able to do a setProperty to get an object attribute.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7718 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bd83cb63
......@@ -780,8 +780,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
return default_value
security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' )
_marker=[]
def getProperty(self, key, d=_marker, **kw):
def getProperty(self, key, d=None, **kw):
"""
Previous Name: getValue
......@@ -802,11 +801,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
method = getattr(self, accessor_name)
return method(**kw)
else:
value = ERP5PropertyManager.getProperty(self, key, d=d, **kw)
if value is self._marker:
return getattr(self,key)
else:
return getattr(self,key,d)
return ERP5PropertyManager.getProperty(self, key, d=d, **kw)
security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' )
def getPropertyList(self, key, d=None):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment