From 8323905ba303391ee7495c06fa80ab81a8848bf0 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 6 Jun 2023 12:40:50 +0000 Subject: [PATCH] Bug 33845: (follow-up) Rename config and add a second configuration section This patch renames the table in the columns configuration to match the id used in the templates It also adds a section for the moremember table to alllow config of each page as we do for issues Lastly we add the table controls as they exist on the issues tables Signed-off-by: Katrin Fischer --- admin/columns_settings.yml | 34 ++++++++++++++++++- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/holds.js | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml index 0f866fead7..995e26b898 100644 --- a/admin/columns_settings.yml +++ b/admin/columns_settings.yml @@ -1067,6 +1067,38 @@ modules: cannot_be_toggled: 1 cannot_be_modified: 1 + holds-table: + columns: + - + columnname: reservedate + - + columnname: title + - + columnname: callnumber + - + columnname: itemtype + - + columnname: barcode + - + columnname: pickup_location + - + columnname: expirationdate + - + columnname: priority + - + columnname: notes + is_hidden: 1 + - + columnname: delete + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: suspend + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: status + relatives-issues-table: columns: - @@ -1442,7 +1474,7 @@ modules: columnname: phone is_hidden: 1 - holds_table: + holds-table: columns: - columnname: reservedate 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 8f89155781..af4f45538f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -908,7 +908,7 @@ table_settings_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'issues-table', 'json' ) | $raw %] table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'relatives-issues-table', 'json' ) | $raw %] table_settings_borrowers_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'table_borrowers', 'json' ) | $raw %] - table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds_table', 'json' ) | $raw %] + table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds-table', 'json' ) | $raw %] [% IF borrowernumber and patron %] if( Cookies.get("holdfor") != [% patron.borrowernumber | html %]){ 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 9bcf5f8a27..3cab722605 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -712,7 +712,7 @@ table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %] table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'relatives-issues-table', 'json' ) | $raw %] - table_settings_holds_table = [% TablesSettings.GetTableSettings( 'circ', 'circulation', 'holds_table', 'json' ) | $raw %] + table_settings_holds_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'holds-table', 'json' ) | $raw %] $(document).ready(function() { $("#info_digests").tooltip(); diff --git a/koha-tmpl/intranet-tmpl/prog/js/holds.js b/koha-tmpl/intranet-tmpl/prog/js/holds.js index c07380df20..95b8d1cd08 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/holds.js +++ b/koha-tmpl/intranet-tmpl/prog/js/holds.js @@ -128,7 +128,7 @@ $(document).ready(function() { var title; holdsTable = KohaTable("holds-table", { "bAutoWidth": false, - "dom": "rt", + "dom": '<"table_controls"B>rt', "aoColumns": [ { "data": { _: "reservedate_formatted", "sort": "reservedate" } -- 2.30.2