From cef6bbd660e45f49aee165e72f2448d92aeac32b Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Mon, 18 Jan 2021 16:18:09 +0100
Subject: [PATCH] Bug 27465: Add column visibility to admin/cities.pl

We want admin/cities.pl to be using as much DT features as possible to be used as an example.

Test plan:
Add some cities, go to admin/cities.pl confirm that you can show/hide
column.

Go to the tables settings admin page and confirm that you can set some
default settings from there.

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 admin/columns_settings.yml                      | 17 +++++++++++++++++
 .../prog/en/modules/admin/cities.tt             |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index 60107a6e70..2bc56bfc6f 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -155,6 +155,23 @@ modules:
               cannot_be_toggled: 1
               cannot_be_modified: 1
   admin:
+    cities:
+      table_cities:
+        columns:
+            -
+              columnname: city_id
+            -
+              columnname: city_name
+            -
+              columnname: city_state
+            -
+              columnname: city_zipcode
+            -
+              columnname: city_country
+            -
+              columnname: actions
+              cannot_be_toggled: 1
+              cannot_be_modified: 1
     currency:
       currencies-table:
         columns:
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index f31f9c7200..cd0da5df0a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -1,6 +1,7 @@
 [% USE raw %]
 [% USE Asset %]
 [% SET footerjs = 1 %]
+[% USE TablesSettings %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>
     [% IF op =='add_form' %]
@@ -210,8 +211,10 @@
 [% MACRO jsinclude BLOCK %]
     [% Asset.js("js/admin-menu.js") | $raw %]
     [% INCLUDE 'datatables.inc' %]
+    [% INCLUDE 'columns_settings.inc' %]
     <script>
 
+        var columns_settings = [% TablesSettings.GetColumns( 'admin', 'cities', 'table_cities', 'json' ) | $raw %];
         $(document).ready(function() {
             var cities_table_url = '/api/v1/cities?';
 
@@ -276,7 +279,7 @@
                         "orderable": false
                     }
                 ]
-            }, [], 1);
+            }, columns_settings, 1);
 
         });
     </script>
-- 
2.39.5