From 51fb971b03409400193d4edc66078c2171804699 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 17 May 2023 11:34:54 +0200 Subject: [PATCH] Bug 33568: Fix action links display MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Owen Leonard Signed-off-by: Laurence Rault Signed-off-by: Emily Lamancusa Signed-off-by: Tomás Cohen Arazi Signed-off-by: Katrin Fischer --- .../prog/en/modules/catalogue/detail.tt | 52 ++++++++++--------- 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index e9ee7fee13..bc7c74d6b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -1383,11 +1383,6 @@ itemSelectionBuildActionLinks(div); }); - $("input[name='itemnumber'][type='checkbox']").change(function() { - var div = $(this).parents('table').parent().parent().attr("id"); - itemSelectionBuildActionLinks(div); - }); - $(".SelectAll").on("click",function(e){ e.preventDefault(); var tab = $(this).data("tab"); @@ -1404,20 +1399,22 @@ $(".show_filters").on("click",function(e){ e.preventDefault(); - let tab = $(this).data("tab"); - $("#"+tab).find(".show_filters").hide(); - $("#"+tab).find(".hide_filters").show(); - $("#"+tab+"_table thead tr:eq(1)").remove(); - build_items_table(tab+"_table", true, { dom: dataTablesDefaults.dom, destroy: true } ); + let tab_id = $(this).data("tab"); + let tab = $("#"+tab_id); + tab.find(".show_filters").hide(); + tab.find(".hide_filters").show(); + $("#"+tab_id+"_table thead tr:eq(1)").remove(); + build_items_table(tab_id, true, { dom: dataTablesDefaults.dom, destroy: true } ); }); $(".hide_filters").on("click",function(e){ e.preventDefault(); - let tab = $(this).data("tab"); - $("#"+tab).find(".hide_filters").hide(); - $("#"+tab).find(".show_filters").show(); - $("#"+tab+"_table thead tr:eq(1)").remove(); - build_items_table(tab+"_table", false, { dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', destroy: true } ); + let tab_id = $(this).data("tab"); + let tab = $("#"+tab_id); + tab.find(".hide_filters").hide(); + tab.find(".show_filters").show(); + $("#"+tab_id+"_table thead tr:eq(1)").remove(); + build_items_table(tab_id, false, { dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>', destroy: true } ); }); }); [% END %] @@ -1862,9 +1859,9 @@ // End bundle handling [% END %] - let items_table_ids = [ 'holdings_table', 'otherholdings_table' ]; - items_table_ids.forEach( function( table_id, index ) { - build_items_table(table_id, false, { dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>' }); + let items_tab_ids = [ 'holdings', 'otherholdings' ]; + items_tab_ids.forEach( function( tab_id, index ) { + build_items_table(tab_id, false, { dom: 'C<"top pager"ilpfB><"#filter_c">tr<"bottom pager"ip>' }); [% IF bundlesEnabled %] // Add event listener for opening and closing bundle details @@ -2203,17 +2200,17 @@ [% END %] let items_table_settings = { - holdings_table: [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %], - otherholdings_table: [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json') | $raw %], + holdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','holdings_table','json') | $raw %], + otherholdings: [% TablesSettings.GetTableSettings('catalogue', 'detail','otherholdings_table','json') | $raw %], }; - function build_items_table (table_id, add_filters, dt_options) { + function build_items_table (tab_id, add_filters, dt_options) { let default_filters = {}; [% IF Koha.Preference('SeparateHoldings') %] [% SET SeparateHoldingsBranch = Koha.Preference('SeparateHoldingsBranch') || 'homebranch' %]; let branch = '[% IF SeparateHoldingsBranch == 'homebranch' %]me.home_library_id[% ELSE %]me.holding_library_id[% END %]'; - if ( table_id == 'holdings_table' ) { + if ( tab_id == 'holdings' ) { default_filters[branch] = '[% Branches.GetLoggedInBranchcode() | html %]'; } else { default_filters[branch] = { '!=': '[% Branches.GetLoggedInBranchcode() | html %]' }; @@ -2223,7 +2220,7 @@ [% IF hidden_count %] default_filters.lost_status = "0"; [% END %] - var items_table = $("#" + table_id).kohaTable({ + var items_table = $("#" + tab_id + '_table').kohaTable({ ajax: { url: item_table_url }, order: [[ 0, "asc" ]], embed, @@ -2687,13 +2684,20 @@ table.columns(i).visible(false); } }); + itemSelectionBuildActionLinks(tab_id); + }, + drawCallback: function(settings){ + $(this).find("td:first input[name='itemnumber'][type='checkbox']").on("change", function(){ + itemSelectionBuildActionLinks(tab_id); + }); }, ...dt_options, }, - items_table_settings[table_id], + items_table_settings[tab_id], add_filters, default_filters, ); + return items_table; } -- 2.39.5