From dbda1d8e250b1f284599864b5bdb65c9439eb449 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 13 Feb 2026 11:31:30 -0500 Subject: [PATCH] Bug 41040: (follow-up) Move JS to global JS file --- .../prog/en/includes/member-search-box.inc | 20 +------------ .../intranet-tmpl/prog/js/staff-global.js | 30 ++++++++++++++++++- 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc index dbd3889a644..54ed623f1ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-search-box.inc @@ -6,25 +6,7 @@ [% IF CAN_user_borrowers_edit_borrowers || CAN_user_borrowers_list_borrowers %] [%- SET searchtype = searchtype || Koha.Preference('DefaultPatronSearchMethod') -%] [% WRAPPER tab_panel tabname="patron_search" bt_active= bs_tab_active %] -
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js index 264ad54f716..bfac800c53f 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/staff-global.js +++ b/koha-tmpl/intranet-tmpl/prog/js/staff-global.js @@ -1,5 +1,5 @@ /* global shortcut delBasket AUDIO_ALERT_PATH Cookies */ -/* exported addBibToContext delBibToContext escape_str escape_price openWindow _ removeFocus toUC confirmDelete confirmClone playSound */ +/* exported addBibToContext delBibToContext escape_str escape_price openWindow _ removeFocus toUC confirmDelete confirmClone playSound validatePatronSearch */ if (KOHA === undefined) var KOHA = {}; function _(s) { @@ -477,6 +477,11 @@ $(document).ready(function () { e.preventDefault(); togglePanel($(this)); }); + + $("#patron_header_search").on("submit", function (e) { + e.preventDefault(); + validatePatronSearch($(this)[0]); + }); }); function removeLastBorrower() { @@ -1066,3 +1071,26 @@ function getScrollto(target, elemid) { } return yoffset.top - elem_height - 20; } + +function validatePatronSearch(form) { + const searchTerm = form.searchmember.value.trim(); + const branchSelected = + form.branchcode_filter && form.branchcode_filter.value !== ""; + const categorySelected = + form.categorycode_filter && form.categorycode_filter.value !== ""; + + if (!searchTerm && !branchSelected && !categorySelected) { + $(form.searchmember) + .tooltip({ + trigger: "manual", + placement: "bottom", + title: __("Please enter a card number or name"), + }) + .tooltip("show"); + $(document).on("click", function () { + $(form.searchmember).tooltip("hide"); + }); + return false; + } + return true; +} -- 2.39.5