From 14aff6595bec1f157e35aff1f51a8400d3688bca Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 17 Jul 2020 17:29:15 +0000 Subject: [PATCH] Bug 26010: Remove the use of jquery.checkboxes plugin from staff interface cart This patch removes the use of the jquery.checkboxes plugin from the staff interface cart and replaces its functionality with "plain" jQuery. To test, apply the patch and add some items to the Cart in the staff interface. - Open the Cart window in the staff interface by clicking the "Cart" link in the header. - Test that the "Select all" and "Clear all" links work correctly to check and uncheck all checkboxes. - Test that the "Remove" or "Place hold" controls work correctly, applying to only the checked checkboxes whether they were checked using "Select all" or by manually checking them. Signed-off-by: Sally Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart (cherry picked from commit 4cf5ef239f1e1a05c277a91f73b6fcd245eb5ec0) Signed-off-by: Lucas Gass --- .../prog/en/modules/basket/basket.tt | 1 - koha-tmpl/intranet-tmpl/prog/js/cart.js | 29 +++++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt index d110dcbe52..05036622a5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt @@ -322,7 +322,6 @@ [% INCLUDE js_includes.inc %] [% INCLUDE 'datatables.inc' %] [% Asset.js("js/cart.js") | $raw %] - [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/cart.js b/koha-tmpl/intranet-tmpl/prog/js/cart.js index 923ed3242a..fbf97fb6fe 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/cart.js +++ b/koha-tmpl/intranet-tmpl/prog/js/cart.js @@ -66,24 +66,21 @@ function batchModify(){ $(document).ready(function(){ $("#items-popover").popover(); - $("#CheckAll").click(function(){ - var checked = []; - $("#bookbag_form").checkCheckboxes("*", true).each( - function() { - $(this).change(); - } - ); - return false; + + $("#CheckAll").click(function (e) { + e.preventDefault(); + $(".select_record").each(function () { + $(this).prop("checked", true).change(); + }); }); - $("#CheckNone").click(function(){ - var checked = []; - $("#bookbag_form").unCheckCheckboxes("*",true).each( - function() { - $(this).change(); - } - ); - return false; + + $("#CheckNone").click(function (e) { + e.preventDefault(); + $(".select_record").each(function () { + $(this).prop("checked", false).change(); + }); }); + $(".holdsep").text("| "); $(".hold").text(_("Place hold")); $("#downloadcartc").empty(); -- 2.39.5