From a89e7426dae96bb6c11391e91243c2f1e3db0657 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Sun, 28 Feb 2021 15:51:27 +0000 Subject: [PATCH] Bug 26247: Only copy header inputs if marked sticky This alters the 'keep_text' function to require 'head-searchbox' elements to be marked with class 'sticky' ti have values carry over There have been complaints about the stickiness of retained search terms, this patch attempts to mitigate that while preserving stickiness for other searches To test: 1 - Enable 'StaffRetainSearchTerms' (or don't apply previous patches) 2 - Search in staff client from header 3 - Search term is retained in the search box 4 - Click abother tab like 'checkin' 5 - Search term is copied to new tab 6 - Apply patch 7 - Reload the page 8 - Search in header 9 - Search term still retained 10 - Click on another header tab 11 - Search term is not copied Signed-off-by: Sally --- koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc | 4 ++-- .../intranet-tmpl/prog/en/includes/contracts-admin-search.inc | 2 +- .../intranet-tmpl/prog/en/includes/currencies-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc | 2 +- koha-tmpl/intranet-tmpl/prog/js/staff-global.js | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc index a62f8e3556..ca3502fa4b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc @@ -8,14 +8,14 @@ @@ -25,7 +25,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc index 2e82fb6e89..e0044eefa4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc @@ -8,14 +8,14 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc index 294af36d9c..5cbba32a28 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc @@ -5,7 +5,7 @@ @@ -21,7 +21,7 @@ [% ELSE %] [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc index 85ad5e2c11..4eb59a5d92 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc @@ -6,7 +6,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc index 48c30f7690..a332b41470 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc @@ -5,7 +5,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc index 5b67592d68..863d267acd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc @@ -5,7 +5,7 @@ @@ -21,7 +21,7 @@ [% ELSE %] [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc index 27c55daa06..40f334fb33 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc @@ -8,14 +8,14 @@ @@ -25,7 +25,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc index 3d78eafdaf..052d2a6c8e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc @@ -5,7 +5,7 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js index 4f06af9465..27006cae0b 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js @@ -258,7 +258,7 @@ function playSound( sound ) { // For keeping the text when navigating the search tabs function keep_text(clicked_index) { - var searchboxes = document.getElementsByClassName("head-searchbox"); + var searchboxes = document.getElementsByClassName("head-searchbox sticky"); var persist = searchboxes[0].value; for (i = 0; i < searchboxes.length - 1; i++) { -- 2.11.0