From fbba90eed229dd32eadfcbb8ef674ae950eb79d2 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 14 Aug 2020 15:18:37 +0000
Subject: [PATCH] Bug 26215: Remove the use of jquery.checkboxes plugin from
Z39.50 search pages
This patch removes the use of the jquery.checkboxes plugin from three
Z39.50 search templates: Acquisitions, Authorities, and Cataloging.
To test, apply the patch and test the controls for selecting and
deselecting Z39.50 search targets on the following pages:
- In Acquisitions: Locate a vendor and add to basket -> From an
external source.
- In Authorities: Click "New authority" -> "New from Z39.50/SRU."
- In Cataloging: Click "New from Z39.50/SRU."
Signed-off-by: Amit Gupta <amit.gupta@informaticsglobal.com>
---
.../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 1 -
.../prog/en/modules/cataloguing/z3950_auth_search.tt | 1 -
.../prog/en/modules/cataloguing/z3950_search.tt | 1 -
koha-tmpl/intranet-tmpl/prog/js/z3950_search.js | 12 ++++++------
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index f3aab65..f8d2ee7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -226,7 +226,6 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
[% MACRO jsinclude BLOCK %]
[% Asset.js("js/acquisitions-menu.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
- [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
[% Asset.js("js/z3950_search.js") | $raw %]
<script>
$(document).ready(function(){
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
index b66e9d6..7335ac6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
@@ -168,7 +168,6 @@
[% IF ( numberpending ) %]<h3 align="center">Still [% numberpending | html %] servers to search</h3>[% END %]
[% MACRO jsinclude BLOCK %]
- [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("js/z3950_search.js") | $raw %]
<script>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
index 78e31de..5481a8c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
@@ -236,7 +236,6 @@
[% END %]
[% MACRO jsinclude BLOCK %]
- [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") | $raw %]
[% Asset.js("js/z3950_search.js") | $raw %]
[% INCLUDE 'datatables.inc' %]
[% INCLUDE 'columns_settings.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
index 7ee94e5..368aacb 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
@@ -13,13 +13,13 @@ function Import(Breeding, recordid, AuthType, FrameworkCode) {
$( document ).ready( function() {
- $( "#CheckAll" ).click( function() {
- $( ".checkboxed" ).checkCheckboxes();
- return false;
+ $( "#CheckAll" ).click( function(e) {
+ e.preventDefault();
+ $( ".checkboxed input:checkbox" ).prop("checked", true);
});
- $( "#CheckNone" ).click( function() {
- $( ".checkboxed" ).unCheckCheckboxes();
- return false;
+ $( "#CheckNone" ).click( function(e) {
+ e.preventDefault();
+ $( ".checkboxed input:checkbox" ).prop("checked", false);
});
$( ".submit" ).on( "click", function() {
--
2.7.4