From 52200f52958659dd3006ad7891addeb0b271a77d Mon Sep 17 00:00:00 2001 From: Arthur Suzuki Date: Tue, 5 Nov 2024 19:06:18 +0100 Subject: [PATCH] Bug 30221: (QA follow-up) make holdshistory table configurable Signed-off-by: Lucas Gass --- admin/columns_settings.yml | 23 +++++++++++++++++++ .../bootstrap/en/includes/holds-table.inc | 2 +- .../bootstrap/en/modules/opac-holdshistory.tt | 23 ++++++++++--------- 3 files changed, 36 insertions(+), 12 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index ec2430dff70..f4737d0ad9c 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -2618,6 +2618,29 @@ modules: columnname: checkout_branch - columnname: links + table_holdshistory: + columns: + - + columnname: title + - + columnname: author + - + columnname: barcode + - + columnname: library + - + columnname: hold_date + - + columnname: expiration_date + - + columnname: waiting_date + - + columnname: cancellation_date + - + columnname: item_type + - + columnname: status + serials: claims: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc index e6b5cdc49cc..f2384fe7124 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/holds-table.inc @@ -27,7 +27,7 @@ [% END %] Status [% IF SuspendHoldsOpac and ! onlyinfo %] - Suspend + Suspend [% END %] [% IF ! onlyinfo %] Modify diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt index 7a835870209..a25646d4777 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -97,18 +97,18 @@ Holds history - Title - Author - Barcode - Library - Hold date - Expiration date - Waiting date - Cancellation date + Title + Author + Barcode + Library + Hold date + Expiration date + Waiting date + Cancellation date [% IF show_itemtype_column %] - Requested item type + Requested item type [% END %] - Status + Status @@ -196,6 +196,7 @@ $("#sort").change(function () { $("#sortform").submit(); }); + var table_settings = [% TablesSettings.GetColumns( 'opac', 'patron_details', 'table_holdshistory', 'json') | $raw %]; var table = $("#table_holdshistory").kohaTable({ dom: '<"top"<"table_entries"i><"table_controls"fB>>t', autoWidth: false, @@ -204,7 +205,7 @@ search: "_INPUT_", searchPlaceholder: _("Search"), }, - }); + }, table_settings); }); [% END %] -- 2.39.5