From 145594bc8938f59e36e3d0edfd6d261445471673 Mon Sep 17 00:00:00 2001 From: Johannes Raggam Date: Sat, 29 Jun 2019 20:40:11 +0200 Subject: [PATCH] Fix case where multiple indexes with similar name seperated by ``_`` were interpreted as options. Fixes #78. --- CHANGES.rst | 9 +++++++-- src/Products/ZCatalog/query.py | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f23a7eb8..b0c0fb07 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,7 +4,12 @@ Changelog 5.1 (unreleased) ---------------- -- Nothing changed yet. +Bug fixes ++++++++++ + +- Fix case where multiple indexes with similar name seperated by ``_`` were interpreted as options. + Fixes #78. + [thet] 5.0.1 (2019-06-17) @@ -13,7 +18,7 @@ Changelog Bug fixes +++++++++ -- Fix sorting of index overview table in ZMI. Migrated the template from +- Fix sorting of index overview table in ZMI. Migrated the template from to zpt. (`#62 `_) diff --git a/src/Products/ZCatalog/query.py b/src/Products/ZCatalog/query.py index 87a7309c..e18836dd 100644 --- a/src/Products/ZCatalog/query.py +++ b/src/Products/ZCatalog/query.py @@ -89,8 +89,8 @@ def __init__(self, request, iid, options=(), operators=('or', 'and'), for field in request.keys(): if field.startswith(iid + '_'): iid_tmp, op = field.split('_') - - self.set(op, request[field]) + if op in self.options: + self.set(op, request[field]) self.keys = keys not_value = getattr(self, 'not', None)