From 4e035ba8ae970ca933df803578bc4cde6af23ccb Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
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 <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 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 34b59b55de..b379f5863b 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -1072,6 +1072,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:
             -
@@ -1447,7 +1479,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 7bf6984689..dfc42a6b9e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -916,7 +916,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 21d5a07080..f070c3eb97 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -717,7 +717,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 d0f7de4da1..afafcf89dd 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.39.5