From e35e1b5869c8cbc98efd86136e14bb51a84b863c Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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 <phil@chetcolibrary.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
(cherry picked from commit 5d6f0723ce74996a881dfbdf58066b9a15c09bb3)
Signed-off-by: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com>
---
 .../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 e79843fbc1..bb7d80c53a 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 {
 
 <div class="row">
     <div class="col-md-12">
-    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a></fieldset>
+        <fieldset class="action">
+            <input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+            <a class="cancel" href="/cgi-bin/koha/acqui/basket.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Cancel</a>
+        </fieldset>
     </div>
 </div>
 </form>
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 7bf4cfa9b9..1fdc18df28 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 @@
             </div>
             <nav class="navbar navbar-default navbar-fixed-bottom">
                 <div class="container-fluid">
-                     <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+                     <fieldset class="action"><input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+                     <a class="cancel close" href="#">Cancel</a></fieldset>
                 </div>
             </nav>
         </form>
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 e2a5d4141c..7a44d5644c 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 @@
 
                 <nav class="navbar navbar-default navbar-fixed-bottom">
                     <div class="container-fluid">
-                        <fieldset class="action"><input type="submit" class="btn btn-primary" value="Search" /> <a class="cancel close" href="#">Cancel</a></fieldset>
+                        <fieldset class="action">
+                            <input type="submit" id="submit_z3950_search" class="btn btn-primary" value="Search" />
+                            <a class="cancel close" href="#">Cancel</a>
+                        </fieldset>
                     </div>
                 </nav>
             </form> <!-- /.checkboxed -->
diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
index 478c2ee21e..d801f022e7 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.39.2