From dca51f46aa127fcce439561656da5606dc72e4f8 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Fri, 13 Sep 2019 18:10:25 +0000
Subject: [PATCH] Bug 23612: If no columns in a table can be toggled, don't
 show columns button

This patch makes a change to the JavaScript setup for DataTables button
controls so that if there are no toggle-able buttons (or there is no
columns configuration at all) the column selection menu button will not
appear.

To test, apply the patch and go to Administration -> Columns settings.

 - In the Administration section, find the section for the "libraries"
   table.
 - In the "Cannot be toggled" column, check all the checkboxes.
 - Save.
 - Go to Administration -> Libraries.
 - At the top of the table there should be no "Columns" button, only
   "Clear filter" and "Export" buttons.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/includes/columns_settings.inc     | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
index d7740a018e..a5c5e0c8c6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
@@ -70,17 +70,25 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
                 node.addClass("disabled");
             }
         },
-        {
-            extend: 'colvis',
-            fade: 100,
-            columns: included_ids,
-            className: "columns_controls",
-            titleAttr: _("Columns settings"),
-            text: '<i class="fa fa-lg fa-gear"></i> <span class="dt-button-text">' + _("Columns") + '</span>',
-            exportOptions: {
-                columns: exportColumns
+    ];
+
+    if( included_ids.length > 0 ){
+        dt_parameters[ "buttons" ].push(
+            {
+                extend: 'colvis',
+                fade: 100,
+                columns: included_ids,
+                className: "columns_controls",
+                titleAttr: _("Columns settings"),
+                text: '<i class="fa fa-lg fa-gear"></i> <span class="dt-button-text">' + _("Columns") + '</span>',
+                exportOptions: {
+                    columns: exportColumns
+                },
             },
-        },
+        );
+    }
+
+    dt_parameters[ "buttons" ].push(
         {
             extend: 'collection',
             autoClose: true,
@@ -90,8 +98,7 @@ function KohaTable(id_selector, dt_parameters, columns_settings, add_filters) {
             text: '<i class="fa fa-lg fa-download"></i> <span class="dt-button-text">' + _("Export") + '</span>',
             buttons: export_buttons
         }
-
-    ];
+    );
 
     var table = $(selector);
     if ( add_filters ) {
-- 
2.39.5