Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix case where multiple indexes with similar name seperated by _ were interpreted as options. #79

Merged
merged 9 commits into from
Jan 27, 2021
Merged

Fix case where multiple indexes with similar name seperated by _ were interpreted as options. #79

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dd3e192
Fix case where multiple indexes with similar name seperated by ``_`` …
thet Jun 29, 2019
32a4fa7
Merge branch 'master' into thet-fix-78
Oct 9, 2020
53c77ee
Merge branch 'master' into thet-fix-78
petschki Jan 22, 2021
0f2a8f3
fix ambiguity
petschki Jan 22, 2021
7a25d85
Merge branch 'master' into thet-fix-78
agitator Jan 27, 2021
c37fbdc
raise ValueError again, when operator is not found ... this is intend…
petschki Jan 27, 2021
154c998
add tests for ambiguity fix
petschki Jan 27, 2021
afa2d87
catch possible unpack error
petschki Jan 27, 2021
ddd3413
refactor to contextmanager assertion
petschki Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ Fixes
- Fix case where index value is changed to None after previously being indexed.
(`#100 <https://github.com/zopefoundation/Products.ZCatalog/issues/100>`_)

- Fix case where multiple indexes with similar name seperated by ``_`` were interpreted as options.
Fixes #78.
[thet]


5.1 (2020-04-20)
----------------
Expand Down
4 changes: 2 additions & 2 deletions src/Products/ZCatalog/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down