[Erp5-report] r29886 - /erp5/trunk/products/ERP5Catalog/CatalogTool.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Wed Oct 21 17:05:43 2009
New Revision: 29886

URL: http://svn.erp5.org?rev=29886&view=rev
Log:
Override __init__ of our IndexableObjectWrapper to match our expected signature instead of the one on CMF 2.2 that changed. (approved by jm)

Modified:
    erp5/trunk/products/ERP5Catalog/CatalogTool.py

Modified: erp5/trunk/products/ERP5Catalog/CatalogTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/CatalogTool.py?rev=29886&r1=29885&r2=29886&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/CatalogTool.py [utf8] Wed Oct 21 17:05:43 2009
@@ -95,6 +95,17 @@
 
 
 class IndexableObjectWrapper(CMFCoreIndexableObjectWrapper):
+
+    def __init__(self, vars, ob):
+        # sigh... CMFCoreIndexableObjectWrapper changed signature between
+        # CMF 1.5 and 2.x. The new signature is (self, ob, catalog), and the
+        # 'vars' calculation is done by __init__ itself
+        # FIXME, we should consider taking a page from the CMFCore parent and
+        # move the 'vars' logic here. We would be actually making use of the
+        # 'catalog' parameter, instead of just using it to fetch
+        # portal_workflow.
+        self.__vars = vars
+        self.__ob = ob
 
     def __setattr__(self, name, value):
       # We need to update the uid during the cataloging process