X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/dcb4d334efa90367fc247c73be69590b50260143..refs/heads/zope-2.13:/Folder.py?ds=inline diff --git a/Folder.py b/Folder.py index 05b7129..8ed3cc3 100644 --- a/Folder.py +++ b/Folder.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ####################################################################################### # Plinn - http://plinn.org # -# Copyright (C) 2005-2007 Benoît PIN # +# Copyright (C) 2005-2014 Benoît Pin # # # # This program is free software; you can redistribute it and/or # # modify it under the terms of the GNU General Public License # @@ -266,7 +266,9 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : ctool = getUtilityByInterfaceName('Products.CMFCore.interfaces.ICatalogTool') contentFilter['path'] = {'query':'/'.join(self.getPhysicalPath()), 'depth':1} - return ctool(sort_on='position', **contentFilter) + if not contentFilter.has_key('sort_on') : + contentFilter['sort_index'] = 'position' + return ctool(**contentFilter) security.declarePublic('synContentValues') def synContentValues(self): @@ -359,7 +361,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) : # get method from container that receive uploaded content ti = self.getTypeInfo() method_id = ti.queryMethodID('jsupload_snippet') - meth = getattr(self, method_id) if method_id else lambda : 'Not implemented' + meth = getattr(self, method_id) if method_id else lambda ob : 'Not implemented' RESPONSE.setStatus(httpRespCode) RESPONSE.setHeader('Content-Type', 'text/xml;;charset=utf-8')