Commit ac38cc3c authored by Yoshinori Okuji's avatar Yoshinori Okuji

Revert the previous change that passes evaluate only to ERP5PropertyManager.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3549 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 3d917df2
...@@ -677,7 +677,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ): ...@@ -677,7 +677,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
return default_value return default_value
security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' ) security.declareProtected( Permissions.AccessContentsInformation, 'getProperty' )
def getProperty(self, key, d=None, evaluate=1, **kw): def getProperty(self, key, d=None, **kw):
""" """
Previous Name: getValue Previous Name: getValue
...@@ -702,7 +702,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ): ...@@ -702,7 +702,7 @@ class Base( CopyContainer, PortalContent, ActiveObject, ERP5PropertyManager ):
# if callable(value): value = value() # if callable(value): value = value()
# return value # return value
else: else:
return ERP5PropertyManager.getProperty(self, key, d=d, evaluate=evaluate, **kw) return ERP5PropertyManager.getProperty(self, key, d=d, **kw)
security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' ) security.declareProtected( Permissions.AccessContentsInformation, 'getPropertyList' )
def getPropertyList(self, key, d=None): 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