Merge branch 'master' into ajax-geojson

.github/workflows/main.yml

@@ -32,9 +32,9 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          # sudo apt-get update
+          sudo apt-get update -y
           # sudo apt-get install -y build-essentials
-          sudo apt-get install libxml2-dev libxslt-dev python-dev
+          sudo apt-get install -y libxml2-dev libxslt-dev python-dev
           # sudo apt-get install py-pip  
           pip install \
             virtualenv wheel

.gitignore

@@ -34,6 +34,9 @@ pip-selfcheck.json
 share/
 var/
 pyvenv.cfg
+node_modules/
+.env
+.vscode/
 
 .python-version
 requirements.txt

CHANGES.rst

@@ -4,6 +4,9 @@ Changelog
 3.4.3 (unreleased)
 ------------------
 
+- Fix search which include the terms "and", "or" and "not"
+  [jeffersonbledsoe]
+
 - implement AJAX geoJSON feature (needs ``plone.patternslib>=1.2.2``)
   [petschki]
 

README.rst

@@ -1,6 +1,18 @@
 collective.collectionfilter
 ===========================
 
+|CI| |Coverage|
+
+|Workflows|
+
+.. |CI| image:: https://github.com/collective/collective.collectionfilter/workflows/CI/badge.svg
+   :target: https://github.com/collective/collective.collectionfilter/actions
+.. |Coverage| image:: https://coveralls.io/repos/github/collective/collective.collectionfilter/badge.svg
+   :target: https://coveralls.io/github/collective/collective.collectionfilter
+.. |Workflows| image:: http://github-actions.40ants.com/collective/collective.collectionfilter/matrix.svg
+   :target: https://github.com/collective/collective.collectionfilter/actions
+
+
 Faceted navigation filter for collection results.
 
 This Plone 5 addon allows you to filter collections results for additional catalog metadata.

src/collective/collectionfilter/baseviews.py

@@ -174,6 +174,7 @@ def action_url(self):
     def urlquery(self):
         urlquery = {}
         urlquery.update(self.top_request.form)
+
         for it in (
             TEXT_IDX,
             'b_start',
@@ -191,7 +192,7 @@ def urlquery(self):
         if 'collectionfilter' not in urlquery:
             urlquery['collectionfilter'] = '1'
 
-        return urlquery
+        return ((k, vv) for k, v in urlquery.items() for vv in safe_iterable(v))
 
     @property
     def ajax_url(self):

src/collective/collectionfilter/filteritems.py

@@ -22,9 +22,11 @@
 from zope.component import getUtility
 from zope.globalrequest import getRequest
 from zope.i18n import translate
+import six
 
 import plone.api
 
+
 try:
     from plone.app.event.browser.event_listing import EventListing
 except ImportError:
@@ -80,6 +82,9 @@ def get_filter_items(
 
     # Recursively transform all to unicode
     request_params = safe_decode(request_params)
+    # Things break if sort_order is not a str
+    if six.PY2 and "sort_order" in request_params:
+        request_params["sort_order"] = str(request_params["sort_order"])
 
     # Support for the Event Listing view from plone.app.event
     collection_layout = collection.getLayout()
@@ -109,6 +114,7 @@ def get_filter_items(
     # Get all collection results with additional filter defined by urlquery
     custom_query.update(urlquery)
     custom_query = make_query(custom_query)
+
     catalog_results = ICollection(collection).results(
         batch=False,
         brains=True,