From 95b107e01479dd33f437cc465b1647b304fb32bd Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 14 Jun 2024 16:13:26 +0100 Subject: [PATCH] Bug 37047: (QA follow-up) Move non-bookings code back We inadvertantly adding a little more than just the bookings table js into it's own asset. This patch moves that code back and also renames the asset file to /tables/bookings.js from /bookings-table.js as is the scheme we're attempting to follow now (see '/modals/'). Signed-off-by: Martin Renvoize Signed-off-by: Katrin Fischer (cherry picked from commit 876aff189afe27d536c82241b7ae895c13c8656d) Signed-off-by: Lucas Gass --- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/moremember.tt | 27 ++++++++++++++++++- .../{bookings-table.js => tables/bookings.js} | 25 ++--------------- 3 files changed, 29 insertions(+), 25 deletions(-) rename koha-tmpl/intranet-tmpl/prog/js/{bookings-table.js => tables/bookings.js} (86%) 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 57b549e86b..ff812fe5c1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1137,7 +1137,7 @@ [% INCLUDE 'str/members-menu.inc' %] [% Asset.js("js/members-menu.js") | $raw %] - [% Asset.js("js/bookings-table.js") | $raw %] + [% Asset.js("js/tables/bookings.js") | $raw %] [% Asset.js("js/recalls.js") | $raw %] [% END %] 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 8b34ef3b6f..4debd1abda 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -804,8 +804,33 @@ } } } + + $(document).ready(function () { + $("#info_digests").tooltip(); + + $("#finesholdsissues a[data-toggle='tab']").on( + "shown.bs.tab", + function (e) { + var oTable = $( + "div.dataTables_wrapper > table", + $(e.target.hash) + ).dataTable(); + if (oTable.length > 0) { + oTable.fnAdjustColumnSizing(); + } + } + ); + + $("#view_restrictions").on("click", function () { + $("#reldebarments-tab").click(); + }); + + $("#view_guarantees_finesandcharges").on("click", function () { + $("#guarantees_finesandcharges-tab").click(); + }); + }); - [% Asset.js("js/bookings-table.js") | $raw %] + [% Asset.js("js/tables/bookings.js") | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/bookings-table.js b/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js similarity index 86% rename from koha-tmpl/intranet-tmpl/prog/js/bookings-table.js rename to koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js index c8bab13bc5..78ed4cb0a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/bookings-table.js +++ b/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js @@ -1,30 +1,9 @@ +/* keep tidy */ +// Bookings $(document).ready(function () { var bookings_table; $(document).ready(function () { - $("#info_digests").tooltip(); - $("#finesholdsissues a[data-toggle='tab']").on( - "shown.bs.tab", - function (e) { - var oTable = $( - "div.dataTables_wrapper > table", - $(e.target.hash) - ).dataTable(); - if (oTable.length > 0) { - oTable.fnAdjustColumnSizing(); - } - } - ); - - $("#view_restrictions").on("click", function () { - $("#reldebarments-tab").click(); - }); - - $("#view_guarantees_finesandcharges").on("click", function () { - $("#guarantees_finesandcharges-tab").click(); - }); - - // Bookings // Load bookings table on tab selection $("#bookings-tab").on("click", function () { if (!bookings_table) { -- 2.39.5