Commit 9657a75d authored by Ayush Tiwari's avatar Ayush Tiwari

erp5_catalog: Import `Folder` from ERP5Type.Core instead of OFS

This is the 1st step in moving ZSQLCatalog inside ERP5. Therefore,
we try to remove the dependencies on OFS one by one. Here. we change
this for Folder module and also reomved the monkeypatching of
getPath(which is being used in CopyContainer in CopySupport). The
reason for doing so is to imply using getPath from Base for CatalogTool
objects which was earlier directed to ZSQLCatalog as it use ZSQLCatalog
as one of its base class.
parent dea96c61
......@@ -17,10 +17,10 @@ from App.special_dtml import DTMLFile
from App.Dialogs import MessageDialog
from App.class_init import default__class_init__ as InitializeClass
from OFS.Folder import Folder
from DateTime import DateTime
from Acquisition import Implicit, aq_base
from Persistence import Persistent
from Products.ERP5Type.Core.Folder import Folder
from DocumentTemplate.DT_Util import InstanceDict, TemplateDict
from DocumentTemplate.DT_Util import Eval
from AccessControl.Permission import name_trans
......@@ -939,10 +939,6 @@ class ZCatalog(Folder, Persistent, Implicit):
return record.path
else:
return None
# Next line commented for now as we don't want this getpath function to be used
# whenever a call is being made to any catalog object, instead we prefer using
# the getPath from the base.
getPath = getpath
security.declarePrivate('hasPath')
def hasPath(self, path, sql_catalog_id=None):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment