[Erp5-report] r8382 - /erp5/trunk/products/ERP5Type/Base.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Jul 11 11:57:15 CEST 2006
Author: romain
Date: Tue Jul 11 11:57:13 2006
New Revision: 8382
URL: http://svn.erp5.org?rev=8382&view=rev
Log:
Bug fix: edit method can now modify wrong tales expression.
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=8382&r1=8381&r2=8382&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Tue Jul 11 11:57:13 2006
@@ -974,7 +974,11 @@
# This may be very long...
old_value = None
if not force_update:
- old_value = self.getProperty(key)
+ try:
+ old_value = self.getProperty(key, evaluate=0)
+ except TypeError:
+ old_value = self.getProperty(key)
+
if old_value != kw[key] or force_update:
# We keep in a thread var the previous values
@@ -1315,7 +1319,8 @@
getValueList = _getValueList
security.declareProtected( Permissions.View, '_getDefaultAcquiredValue' )
- def _getDefaultAcquiredValue(self, id, spec=(), filter=None, portal_type=()):
+ def _getDefaultAcquiredValue(self, id, spec=(), filter=None, portal_type=(),
+ evaluate=1):
path = self._getDefaultAcquiredCategoryMembership(id, spec=spec, filter=filter,
portal_type=portal_type, base=1)
# LOG("_getAcquiredDefaultValue",0,str(path))
@@ -1484,7 +1489,7 @@
def _getCategoryMembershipItemList(self, category, spec=(), filter=None, portal_type=(), base=0):
membership_list = self._getCategoryMembershipList(category,
spec = spec, filter=filter, portal_type=portal_type, base=base)
- return map(lambda x: (x,x), membership_list)
+ return [(x, x) for x in membership_list]
security.declareProtected( Permissions.AccessContentsInformation,
'_getAcquiredCategoryMembershipItemList' )
@@ -1497,7 +1502,7 @@
spec = spec, filter=filter, portal_type=portal_type, base=base)
if sort_id == 'default':
membership_list.sort()
- return map(lambda x: (x,x), membership_list)
+ return [(x, x) for x in membership_list]
# Advanced behaviour XXX This is new and needs to be checked
membership_list = self._getAcquiredCategoryMembershipList(category,
spec = spec, filter=filter, portal_type=portal_type, base=1)
@@ -1508,7 +1513,7 @@
result += [value]
result.sort(lambda x, y: cmp(getattr(x,sort_id)(),getattr(y,sort_id)()))
if method_id is None:
- return map(lambda x: (x,x), membership_list)
+ return [(x, x) for x in membership_list]
return map(lambda x: (x,getattr(x, method_id)()), membership_list)
security.declareProtected( Permissions.View, '_getDefaultCategoryMembership' )
More information about the Erp5-report
mailing list