erp5_catalog: Revert back to monkeypatch getPath with getpath in ZSQLCatalog...

erp5_catalog: Revert back to monkeypatch getPath with getpath in ZSQLCatalog and solve inhertiance conflict for CatalogTool

product/ERP5Catalog/CatalogTool.py

@@ -350,6 +350,7 @@ class CatalogTool (BaseTool, ZCatalog, CMFCoreCatalogTool):
     # we use this function here to sometimes get objects to delete which if
     # not solved of inheritance conflict might lead to catalog deletion.
     getObject = ZCatalog.getObject
+    getPath = ZCatalog.getpath
 
     def __init__(self):
         ZCatalog.__init__(self, self.getId())

product/ZSQLCatalog/ZSQLCatalog.py

@@ -940,8 +940,7 @@ class ZCatalog(OFSFolder, Persistent, Implicit):
         return record.path
       else:
         return None
-  # Use getPath from Base class while calling getPath on ZSQLCatalog
-  getPath = Folder.getPath
+  getPath = getpath
 
   security.declarePrivate('hasPath')
   def hasPath(self, path, sql_catalog_id=None):