From 0a600d3277547a76e20a7f7e025a3e9a2240d1dc Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Wed, 11 Nov 2020 22:28:05 +0100
Subject: [PATCH] Fix hide/view columns dialog did not work on pages with more
 than 1 table (references #1058)

---
 public/js/grocy.js                | 2 +-
 views/batteries.blade.php         | 3 +--
 views/batteriesjournal.blade.php  | 4 ++--
 views/batteriesoverview.blade.php | 4 ++--
 views/chores.blade.php            | 4 ++--
 views/choresjournal.blade.php     | 4 ++--
 views/choresoverview.blade.php    | 4 ++--
 views/equipment.blade.php         | 4 ++--
 views/locations.blade.php         | 4 ++--
 views/manageapikeys.blade.php     | 4 ++--
 views/productform.blade.php       | 9 ++++-----
 views/productgroups.blade.php     | 4 ++--
 views/products.blade.php          | 4 ++--
 views/quantityunitform.blade.php  | 4 ++--
 views/quantityunits.blade.php     | 4 ++--
 views/recipeform.blade.php        | 8 ++++----
 views/recipes.blade.php           | 4 ++--
 views/shoppinglist.blade.php      | 4 ++--
 views/shoppinglocations.blade.php | 4 ++--
 views/stockentries.blade.php      | 4 ++--
 views/stockjournal.blade.php      | 4 ++--
 views/stockoverview.blade.php     | 4 ++--
 views/taskcategories.blade.php    | 4 ++--
 views/tasks.blade.php             | 4 ++--
 views/userentities.blade.php      | 4 ++--
 views/userfields.blade.php        | 4 ++--
 views/users.blade.php             | 4 ++--
 27 files changed, 56 insertions(+), 58 deletions(-)

diff --git a/public/js/grocy.js b/public/js/grocy.js
index c83134ed..2be5b6e5 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -762,7 +762,7 @@ $(window).on("message", function(e)
 	}
 });
 
-$("#change-table-columns-visibility").on("click", function(e)
+$(".change-table-columns-visibility-button").on("click", function(e)
 {
 	var dataTableSelector = $(e.currentTarget).attr("data-table-selector");
 	var dataTable = $(dataTableSelector).DataTable();
diff --git a/views/batteries.blade.php b/views/batteries.blade.php
index a7222692..9d4e72a2 100644
--- a/views/batteries.blade.php
+++ b/views/batteries.blade.php
@@ -70,8 +70,7 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#batteries-table"
diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php
index 5d898811..b2264286 100644
--- a/views/batteriesjournal.blade.php
+++ b/views/batteriesjournal.blade.php
@@ -65,8 +65,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#batteries-journal-table"
diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index c8a3a9ed..76459d34 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -87,8 +87,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#batteries-overview-table"
diff --git a/views/chores.blade.php b/views/chores.blade.php
index c3756d29..6ab4529e 100644
--- a/views/chores.blade.php
+++ b/views/chores.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#chores-table"
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php
index bd0ca3be..8d83c05b 100644
--- a/views/choresjournal.blade.php
+++ b/views/choresjournal.blade.php
@@ -65,8 +65,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#chores-journal-table"
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index 2c4ab8c4..b3585ef0 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -109,8 +109,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#chores-overview-table"
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index be927f12..60d7e8ec 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -61,8 +61,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#equipment-table"
diff --git a/views/locations.blade.php b/views/locations.blade.php
index 697b4d44..6f4c722c 100644
--- a/views/locations.blade.php
+++ b/views/locations.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#locations-table"
diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php
index e9b3b1b8..18d66aa6 100644
--- a/views/manageapikeys.blade.php
+++ b/views/manageapikeys.blade.php
@@ -75,8 +75,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#apikeys-table"
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 5a0e56d4..b2b892db 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -393,8 +393,8 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+									data-toggle="tooltip"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
 									data-table-selector="#barcode-table"
@@ -484,11 +484,10 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
-									data-table-selector="#qu-conversion-table"
+									data-table-selector="#qu-conversions-table"
 									href="#"><i class="fas fa-eye"></i></a>
 							</th>
 							<th>{{ $__t('Quantity unit from') }}</th>
diff --git a/views/productgroups.blade.php b/views/productgroups.blade.php
index 4949fe6a..179255fe 100644
--- a/views/productgroups.blade.php
+++ b/views/productgroups.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#productgroups-table"
diff --git a/views/products.blade.php b/views/products.blade.php
index a0711287..fd648cf0 100644
--- a/views/products.blade.php
+++ b/views/products.blade.php
@@ -88,8 +88,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#products-table"
diff --git a/views/quantityunitform.blade.php b/views/quantityunitform.blade.php
index 8ee8a648..614ce14c 100644
--- a/views/quantityunitform.blade.php
+++ b/views/quantityunitform.blade.php
@@ -126,8 +126,8 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+									data-toggle="tooltip"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
 									data-table-selector="#qu-conversions-table"
diff --git a/views/quantityunits.blade.php b/views/quantityunits.blade.php
index 3929b8c9..7f3b3f45 100644
--- a/views/quantityunits.blade.php
+++ b/views/quantityunits.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#quantityunits-table"
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index 0fb2b838..cec8546a 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -145,8 +145,8 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+									data-toggle="tooltip"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
 									data-table-selector="#recipes-pos-table"
@@ -248,8 +248,8 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+									data-toggle="tooltip"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
 									data-table-selector="#recipes-includes-table"
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 3283cbd7..bccefd3b 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -99,8 +99,8 @@
 					class="table table-sm table-striped nowrap w-100">
 					<thead>
 						<tr>
-							<th class="border-right"><a id="change-table-columns-visibility"
-									class="text-muted"
+							<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+									data-toggle="tooltip"
 									data-toggle="tooltip"
 									title="{{ $__t('Hide/view columns') }}"
 									data-table-selector="#recipes-table"
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index faa434e8..16697cd8 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -175,8 +175,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#shoppinglist-table"
diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php
index 463a670d..680d72fa 100644
--- a/views/shoppinglocations.blade.php
+++ b/views/shoppinglocations.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#shoppinglocations-table"
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 21769a29..0d8aa087 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -36,8 +36,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#stockentries-table"
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index 1d2a2b34..a2b7316b 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -76,8 +76,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#stock-journal-table"
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index fe73997b..b9bfffbc 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -145,8 +145,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#stock-overview-table"
diff --git a/views/taskcategories.blade.php b/views/taskcategories.blade.php
index 6566d0e2..5e26b710 100644
--- a/views/taskcategories.blade.php
+++ b/views/taskcategories.blade.php
@@ -70,8 +70,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#taskcategories-table"
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index 2d809075..d742cd03 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -105,8 +105,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#tasks-table"
diff --git a/views/userentities.blade.php b/views/userentities.blade.php
index 80a63f6c..069c1b0a 100644
--- a/views/userentities.blade.php
+++ b/views/userentities.blade.php
@@ -66,8 +66,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#userentities-table"
diff --git a/views/userfields.blade.php b/views/userfields.blade.php
index 9fc52b45..8948b61f 100644
--- a/views/userfields.blade.php
+++ b/views/userfields.blade.php
@@ -80,8 +80,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#userfields-table"
diff --git a/views/users.blade.php b/views/users.blade.php
index 71c6553e..35e33ddc 100644
--- a/views/users.blade.php
+++ b/views/users.blade.php
@@ -66,8 +66,8 @@
 			class="table table-sm table-striped nowrap w-100">
 			<thead>
 				<tr>
-					<th class="border-right"><a id="change-table-columns-visibility"
-							class="text-muted"
+					<th class="border-right"><a class="text-muted change-table-columns-visibility-button"
+							data-toggle="tooltip"
 							data-toggle="tooltip"
 							title="{{ $__t('Hide/view columns') }}"
 							data-table-selector="#users-table"