From a7c4335c2c05beef6602765ce66d4192891cb476 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 18 Oct 2017 10:03:30 +0530 Subject: [PATCH] Server: Fix adding expressions to the search always using AND instead of respecting the setting to use OR or AND. Fixes #1724405 [request in remote client server](https://bugs.launchpad.net/calibre/+bug/1724405) --- src/pyj/book_list/search.pyj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pyj/book_list/search.pyj b/src/pyj/book_list/search.pyj index 0232e3ea43..796111a04b 100644 --- a/src/pyj/book_list/search.pyj +++ b/src/pyj/book_list/search.pyj @@ -153,9 +153,8 @@ def node_clicked(i): execute_search(expr) -def add_to_search(node, search_type, anded): - if anded is undefined or anded is None: - anded = get_session_data().get('and_search_terms') +def add_to_search(node, search_type): + anded = get_session_data().get('and_search_terms') state.active_nodes[node.id] = [search_type, anded] render_search_expression()