From 6f5952023c615e72d3fe36aafe3b5fd82c8794fd Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 4 Jun 2018 13:52:28 +0000 Subject: [PATCH] Bug 20864: Only set bibs_selected cookie when BrowseResultSelection is activated This patch adds a system preference check around the call to the JavaScript include which sets the bibs_selected cookie. With BrowseResultsSelection disabled, the cookie should never be set. To test you should be using a browser with a tool for inspecting cookies. View the cookies for your Koha domain under each of these conditions, clearing cookies between each step: Without the patch applied: - With BrowseResultSelection enabled, search for any item. Your cookie tool should report that you have a bibs_selected cookie stored. - With BrowseResultSelection disabled, search for any item. You should have a bibs_selected cookie. With the patch applied: - With the BrowseResultSelection system preference enabled, search for any item. Your cookie tool should report that you have a bibs_selected cookie stored. - With BrowseResultSelection disabled, search for any item. You should have no bibs_selected cookie. Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Martin Renvoize --- koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc index de81f3f146..946859a018 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/js_includes.inc @@ -22,7 +22,9 @@ [% Asset.js("lib/jquery/plugins/jquery.validate.min.js") %] [% Asset.js("js/staff-global.js") %] -[% Asset.js("js/commons.js") %] +[% IF Koha.Preference('BrowseResultSelection') %] + [% Asset.js("js/commons.js") %] +[% END %] [% INCLUDE 'validator-strings.inc' %] [% IF ( IntranetUserJS ) %] -- 2.39.5