# HG changeset patch # User Thierry Florac # Date 1595241188 -7200 # Node ID 0c536f62e02a11cefb3a2606042e82e763fbd351 # Parent 1945b374d388e11255482c728a72fbf41595d26b Disable sorting when user entered a custom search string diff -r 1945b374d388 -r 0c536f62e02a src/pyams_content_es/root/zmi/search.py --- a/src/pyams_content_es/root/zmi/search.py Mon Jul 20 10:42:33 2020 +0200 +++ b/src/pyams_content_es/root/zmi/search.py Mon Jul 20 12:33:08 2020 +0200 @@ -70,6 +70,10 @@ fields['fulltext'].widgetFactory = SingleCheckBoxFieldWidget return fields + @property + def sort_results(self): + return not bool(self.request.params.get('search_form.widgets.query')) + @adapter_config(context=(ISiteRoot, IPyAMSLayer, SiteRootAdvancedSearchView), provides=ISearchFormFactory) diff -r 1945b374d388 -r 0c536f62e02a src/pyams_content_es/shared/zmi/search.py --- a/src/pyams_content_es/shared/zmi/search.py Mon Jul 20 10:42:33 2020 +0200 +++ b/src/pyams_content_es/shared/zmi/search.py Mon Jul 20 12:33:08 2020 +0200 @@ -15,6 +15,7 @@ """ from elasticsearch_dsl import Q, Search +from pyramid.decorator import reify from pyramid_es import get_client from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget from zope.dublincore.interfaces import IZopeDublinCore @@ -72,6 +73,10 @@ fields['fulltext'].widgetFactory = SingleCheckBoxFieldWidget return fields + @reify + def sort_results(self): + return not bool(self.request.params.get('search_form.widgets.query')) + @adapter_config(context=(IBaseSharedTool, IPyAMSLayer, SharedToolAdvancedSearchView), provides=ISearchFormFactory)