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

[nobody at svn.erp5.org]

Author: yo
Date: Mon Oct 13 21:04:40 2008
New Revision: 24163

URL: http://svn.erp5.org?rev=24163&view=rev
Log:
_setProperty must return modified objects from a setter. _edit must take this into account, otherwise content property setters do not reindex correct objects.

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=24163&r1=24162&r2=24163&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Base.py (original)
+++ erp5/trunk/products/ERP5Type/Base.py Mon Oct 13 21:04:40 2008
@@ -1405,13 +1405,11 @@
     # rather than through implicit aquisition
     if getattr(aq_self, accessor_name, None) is not None:
       method = getattr(self, accessor_name)
-      method(value, **kw)
-      return
+      return method(value, **kw)
     public_accessor_name = 'set' + UpperCase(key)
     if getattr(aq_self, public_accessor_name, None) is not None:
       method = getattr(self, public_accessor_name)
-      method(value, **kw)
-      return
+      return method(value, **kw)
     # Try to get a portal_type property (Implementation Dependent)
     aq_key = self._aq_key()
     if not Base.aq_portal_type.has_key(aq_key):
@@ -1419,12 +1417,10 @@
     if getattr(Base.aq_portal_type[aq_key], accessor_name, None) is not None:
       method = getattr(self, accessor_name)
       # LOG("Base.py", 0, "method = %s, name = %s" %(method, accessor_name))
-      method(value, **kw)
-      return
+      return method(value, **kw)
     if getattr(Base.aq_portal_type[aq_key], public_accessor_name, None) is not None:
       method = getattr(self, public_accessor_name)
-      method(value, **kw)
-      return
+      return method(value, **kw)
     # Finaly use standard PropertyManager
     #LOG("Changing attr: ",0, key)
     # If we are here, this means we do not use a property that
@@ -1440,6 +1436,7 @@
     #except:
     #  # This should be removed if we want strict property checking
     #  setattr(self, key, value)
+    return (self,)
 
   def _setPropValue(self, key, value, **kw):
     self._wrapperCheck(value)
@@ -1562,6 +1559,7 @@
       hasProperty is False will be updated.
     """
     modified_property_dict = self._v_modified_property_dict = {}
+    modified_object_set = set()
 
     key_list = kw.keys()
     unordered_key_list = [k for k in key_list if k not in edit_order]
@@ -1609,7 +1607,12 @@
                 guarded_getattr(self, accessor_name)
             modified_property_dict[key] = old_value
             if key != 'id':
-              self._setProperty(key, kw[key])
+              modified_object_list = self._setProperty(key, kw[key])
+              # BBB: if the setter does not return anything, assume
+              # that self has been modified.
+              if modified_object_list is None:
+                modified_object_list = (self,)
+              modified_object_set.update(modified_object_list)
             else:
               self.setId(kw['id'], reindex=reindex_object)
         else:
@@ -1622,9 +1625,8 @@
     setChangedPropertyList(ordered_key_list)
 
     if reindex_object:
-      # We do not want to reindex the object if nothing is changed
-      if (modified_property_dict != {}):
-        self.reindexObject(activate_kw=activate_kw)
+      for o in modified_object_set:
+        o.reindexObject(activate_kw=activate_kw)
 
   security.declareProtected( Permissions.ModifyPortalContent, 'setId' )
   def setId(self, id, reindex = 1):