From b460a630ef6772671454ea6ea25d8d4d672f3571 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 3 Nov 2020 11:19:23 +0000 Subject: [PATCH] Bug 7607: Remove empty inputs when submitting search form This patch surrounds the operator, index, and query fields on the advanced search page wtih a 'search_set' class. This allows us to process them as a group and confirm the query is populated before submitting the other parts to the form TO test: 1 - Go to advanced search 2 - Use search boxes to search like: Title: (leave blank) Author: clinton keyword: shuffle 3 - Perform search 4 - Note no results as you searched for title:clinton etc. 5 - apply patch 6 - refresh and repeat 7 - search is now correct 8 - Try vaeious searches with 'more options' and selecting different operators Signed-off-by: David Nind Signed-off-by: David Cook Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart (cherry picked from commit cc970464ec7c881aaa9d8a33931a29a5951e6103) Signed-off-by: Andrew Fuerste-Henry --- .../prog/en/modules/catalogue/advsearch.tt | 6 +++++- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 9eb252d68b..681b8e84df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -95,7 +95,11 @@ [% END %] [% FOREACH search_box IN search_boxes_loop %] - [% IF ( search_boxes_label ) %]
[% ELSE %]
[% END %] + [% IF ( search_boxes_label ) %] +
+ [% ELSE %] +
+ [% END %] [% IF ( expanded_options ) %] [% IF ( search_box.boolean ) %]