Bugzilla – Attachment 152181 Details for
Bug 33945
Add ability to delay the loading of the current checkouts table on the checkouts page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33945: (QA follow-up) Don't show delay message on patron details page
Bug-33945-QA-follow-up-Dont-show-delay-message-on-.patch (text/plain), 4.74 KB, created by
Kyle M Hall (khall)
on 2023-06-08 12:32:45 UTC
(
hide
)
Description:
Bug 33945: (QA follow-up) Don't show delay message on patron details page
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2023-06-08 12:32:45 UTC
Size:
4.74 KB
patch
obsolete
>From 3d43c5c468f45360fe155bfcaf7eab1c82af0a6e Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >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 @@ > <p> > <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a> > [% SET LoadCheckoutsTableDelay = Koha.Preference('LoadCheckoutsTableDelay') %] >- [% IF LoadCheckoutsTableDelay %] >+ [% IF LoadCheckoutsTableDelay && page == 'circulation' %] > <span id="issues-table-load-delay"> > <i id="issues-table-load-delay-spinner" class="fa fa-spinner fa-pulse fa-fw"></i> > <span id="issues-table-load-delay-message">Checkouts table will show automatically in [% LoadCheckoutsTableDelay | html %] seconds...</span> >@@ -46,7 +46,7 @@ > [% INCLUDE 'checkouts-table-footer.inc' %] > </table> > >- <label for="issues-table-load-immediately">Always show checkouts immediately</label> >+ <label for="issues-table-load-immediately">Always show checkouts automatically</label> > <input id="issues-table-load-immediately" type="checkbox" /> > > <div id="issues-table-actions"> >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 @@ > <div class="tab-content"> > <!-- SUMMARY : TODAY & PREVIOUS ISSUES --> > >- [% 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 @@ > </ul> > > <div class="tab-content"> >- [% 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
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 33945
:
152130
|
152134
|
152170
|
152171
|
152173
|
152174
|
152180
|
152181
|
152184
|
152185
|
152186
|
152187