gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 876aff189a)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Martin Renvoize 2024-06-14 16:13:26 +01:00 committed by Lucas Gass
parent 60bbccb242
commit 95b107e014
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
View File

@ -1137,7 +1137,7 @@
</script>
[% 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 %]

27
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View File

@ -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();
});
});
</script>
[% Asset.js("js/bookings-table.js") | $raw %]
[% Asset.js("js/tables/bookings.js") | $raw %]
[% END %]
[% INCLUDE 'intranet-bottom.inc' %]

25
koha-tmpl/intranet-tmpl/prog/js/bookings-table.js → koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js
View File

@ -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) {