From 3d43c5c468f45360fe155bfcaf7eab1c82af0a6e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Thu, 8 Jun 2023 12:32:33 +0000 Subject: [PATCH] Bug 33945: (QA follow-up) Don't show delay message on patron details page --- koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc | 4 ++-- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/checkouts.js | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc index 9798447f20..6c82f446d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc @@ -7,7 +7,7 @@

Show checkouts [% SET LoadCheckoutsTableDelay = Koha.Preference('LoadCheckoutsTableDelay') %] - [% IF LoadCheckoutsTableDelay %] + [% IF LoadCheckoutsTableDelay && page == 'circulation' %] Checkouts table will show automatically in [% LoadCheckoutsTableDelay | html %] seconds... @@ -46,7 +46,7 @@ [% INCLUDE 'checkouts-table-footer.inc' %] - +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index f45e71571c..6090f855c9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -175,7 +175,7 @@ Circulation: - Delay the automatic loading of the checkouts table on the checkouts page by - pref: LoadCheckoutsTableDelay class: integer - - seconds when "Always show checkouts immediately" is enabled. + - seconds when "Always show checkouts automatically" is enabled. - - pref: OnSiteCheckoutAutoCheck choices: diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 681473f491..d3cf767a34 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -890,7 +890,7 @@
- [% INCLUDE "checkouts-table.inc" %] + [% INCLUDE "checkouts-table.inc" page="circulation" %] [% INCLUDE "relatives-issues-table.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index b6c84650a0..4bce5637b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -732,7 +732,7 @@
- [% INCLUDE "checkouts-table.inc" %] + [% INCLUDE "checkouts-table.inc" page="moremember" %] [% INCLUDE "relatives-issues-table.inc" %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js index 828abf3ed6..a591afbc71 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js @@ -261,6 +261,8 @@ $(document).ready(function() { LoadIssuesTable(); } $('#issues-table-load-immediately').prop('checked', true); + } else { + $('#issues-table-load-delay').hide(); } $('#issues-table-load-immediately').on( "change", function(){ Cookies.set("issues-table-load-immediately-" + script, $(this).is(':checked'), { expires: 365, sameSite: 'Lax' }); -- 2.30.2