[Erp5-report] r39215 jm - in /erp5/trunk/products/ERP5Type: ./ patches/
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 15 10:41:03 CEST 2010
Author: jm
Date: Fri Oct 15 10:40:58 2010
New Revision: 39215
URL: http://svn.erp5.org?rev=39215&view=rev
Log:
Fix retrieval of catalog tool for unwrapped objects
This reverts 39157 & 39184 partially.
Modified:
erp5/trunk/products/ERP5Type/CopySupport.py
erp5/trunk/products/ERP5Type/patches/CMFCatalogAware.py
Modified: erp5/trunk/products/ERP5Type/CopySupport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/CopySupport.py?rev=39215&r1=39214&r2=39215&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/CopySupport.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/CopySupport.py [utf8] Fri Oct 15 10:40:58 2010
@@ -360,8 +360,11 @@ class CopyContainer:
Unindex the object from the portal catalog.
"""
if self.isIndexable:
- catalog = getattr(self.getPortalObject(), 'portal_catalog', None)
- if catalog is not None:
+ try:
+ catalog = self.getPortalObject().portal_catalog
+ except AttributeError:
+ pass
+ else:
# Make sure there is not activity for this object
self.flushActivity(invoke=0)
uid = getattr(self,'uid',None)
Modified: erp5/trunk/products/ERP5Type/patches/CMFCatalogAware.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/CMFCatalogAware.py?rev=39215&r1=39214&r2=39215&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/CMFCatalogAware.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/patches/CMFCatalogAware.py [utf8] Fri Oct 15 10:40:58 2010
@@ -16,6 +16,7 @@
from Products.CMFCore.CMFCatalogAware import CMFCatalogAware
from Acquisition import aq_base
+from Products.CMFCore.utils import getToolByName
def reindexObject(self, idxs=[], *args, **kw):
"""
@@ -30,7 +31,7 @@ def reindexObject(self, idxs=[], *args,
# Update the modification date.
if getattr(aq_base(self), 'notifyModified', None) is not None:
self.notifyModified()
- catalog = getattr(self.getPortalObject(), 'portal_catalog', None)
+ catalog = getToolByName(self, 'portal_catalog', None)
if catalog is not None:
catalog.reindexObject(self, idxs=idxs, *args, **kw)
More information about the Erp5-report
mailing list