From: Benoît Pin Date: Wed, 16 Jul 2014 09:11:07 +0000 (+0200) Subject: Merge commit 'a4cb4d96face514924387d34746b3148848ac092' into zope-2.13 X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/d91387052e5e5293ca9fbb839214005cff9f3659?hp=a4cb4d96face514924387d34746b3148848ac092 Merge commit 'a4cb4d96face514924387d34746b3148848ac092' into zope-2.13 Intrégration de Solr effectuée. Reste à le rendre optionnel. --- diff --git a/Folder.py b/Folder.py index 2c498c6..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): diff --git a/profiles/default/types/Portfolio.xml b/profiles/default/types/Portfolio.xml index 3be7ccb..f8c9fec 100644 --- a/profiles/default/types/Portfolio.xml +++ b/profiles/default/types/Portfolio.xml @@ -28,7 +28,7 @@ + visible="False"> - - - - + 2 - 192 - 222 + 278 + 300 #484848 25 100 diff --git a/profiles/photo/types/Portfolio.xml b/profiles/photo/types/Portfolio.xml index 4127495..f8c9fec 100644 --- a/profiles/photo/types/Portfolio.xml +++ b/profiles/photo/types/Portfolio.xml @@ -28,7 +28,7 @@ + visible="False"> - +