From 7d04c9042be3118269aa4115ddfbc6f5a077c9b7 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 10 May 2023 10:42:13 +0000 Subject: [PATCH] Bug 33655: z39.50 search no longer shows search in progress This patch adds an id to z39.50 search interface submit buttons so that the JavaScript event for changing the cursor can be linked to that instead of the obsolete class. The patch also adds code copied from Bug 33233 in order to make the "waiting" cursor revert to the default if the user uses the back button to return to the search form. To test, apply the patch and go to Cataloging -> New from Z39.50 - Fill in a search term and click the submit button - Your cursor should change to a "waiting" cursor while the search is performed, before you're redirected to the results. - From the results page, clicking the back button (or right-clicking the page and choosing "Back") should return you to the search form and your cursor should be a standard pointer. Perform the same test from: - Acquisitions -> Vendor -> Basket -> Add to basket -> From an external source - Authorities -> New from Z39.50/SRU Signed-off-by: Phil Ringnalda Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/en/modules/acqui/z3950_search.tt | 5 ++++- .../prog/en/modules/cataloguing/z3950_auth_search.tt | 3 ++- .../prog/en/modules/cataloguing/z3950_search.tt | 5 ++++- koha-tmpl/intranet-tmpl/prog/js/z3950_search.js | 6 +++++- 4 files changed, 15 insertions(+), 4 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 e79843fbc1c..bb7d80c53a5 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 @@ -139,7 +139,10 @@ tr.selected td {
-
Cancel
+
+ + Cancel +
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 7bf4cfa9b91..1fdc18df283 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 @@ -68,7 +68,8 @@ 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 e2a5d4141cf..7a44d5644c9 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 @@ -108,7 +108,10 @@ diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js index 478c2ee21e5..d801f022e76 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js +++ b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js @@ -16,6 +16,10 @@ function validate_goto_page() { } } +window.addEventListener('pageshow', function( e ){ + $('body').css("cursor", "default"); +}); + $( document ).ready( function() { $( "#CheckAll" ).click( function(e) { @@ -27,7 +31,7 @@ $( document ).ready( function() { $( ".checkboxed input:checkbox" ).prop("checked", false); }); - $( ".submit" ).on( "click", function() { + $( "#submit_z3950_search" ).on( "click", function() { $( "body" ).css( "cursor", "wait" ); }); $( "[name='changepage_prev']" ).on( "click", function() { -- 2.25.1