X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/e189b5bcf54e75538daed6a3c443f401e8f50c19..22840e8a9f012be14803acca587b707a0eb43c2c:/Folder.py?ds=sidebyside diff --git a/Folder.py b/Folder.py index 76d4ee1..e36dec8 100644 --- a/Folder.py +++ b/Folder.py @@ -54,6 +54,7 @@ from Products.CMFCore.permissions import ListFolderContents, View, ViewManagemen ManagePortal, ModifyPortalContent from permissions import DeletePortalContents, DeleteObjects, DeleteOwnedObjects, SetLocalRoles, CheckMemberPermission from Products.CMFCore.utils import _checkPermission, getToolByName +from Products.CMFCore.utils import getUtilityByInterfaceName from Products.CMFCore.CMFCatalogAware import CMFCatalogAware from Products.CMFCore.PortalFolder import PortalFolder, ContentFilter from Products.CMFDefault.DublinCore import DefaultDublinCoreImpl @@ -268,10 +269,15 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : """ query catalog and returns brains of contents. Requires ExtendedPathIndex """ - ctool = getToolByName(self, 'portal_catalog') + #ctool = getToolByName(self, 'portal_catalog') + ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool') + #print ctool.absolute_url() contentFilter['path'] = {'query':'/'.join(self.getPhysicalPath()), 'depth':1} - return ctool(sort_on='position', **contentFilter) + try : + return ctool(sort_on='position', **contentFilter) + except : + return ctool(**contentFilter) security.declarePublic('synContentValues')