Bugzilla – Attachment 150964 Details for
Bug 33655
z39.50 search no longer shows search in progress
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33655: z39.50 search no longer shows search in progress
Bug-33655-z3950-search-no-longer-shows-search-in-p.patch (text/plain), 5.17 KB, created by
Owen Leonard
on 2023-05-10 10:56:33 UTC
(
hide
)
Description:
Bug 33655: z39.50 search no longer shows search in progress
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2023-05-10 10:56:33 UTC
Size:
5.17 KB
patch
obsolete
>From f7f95222f4ce4881800f3cc175d2680b2784b973 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 >--- > .../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 %]&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 %]&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.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 33655
:
150964
|
151040
|
151045