From 7214a0f02581c49fd48b8d6a7cc16f8eb5964cb8 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 26 May 2020 23:18:08 +0200
Subject: [PATCH] Fix initial visibility of group selector on simplified black-
 and whitelist pages.

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 scripts/pi-hole/js/groups-adlists.js | 1 +
 scripts/pi-hole/js/groups-clients.js | 1 +
 scripts/pi-hole/js/groups-domains.js | 3 ++-
 scripts/pi-hole/js/groups.js         | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/pi-hole/js/groups-adlists.js b/scripts/pi-hole/js/groups-adlists.js
index aeea276f..deed16e0 100644
--- a/scripts/pi-hole/js/groups-adlists.js
+++ b/scripts/pi-hole/js/groups-adlists.js
@@ -176,6 +176,7 @@ function initTable() {
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-adlists-table");
+      if (data === null) return null;
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/pi-hole/js/groups-clients.js
index 63a89a31..1a09b54e 100644
--- a/scripts/pi-hole/js/groups-clients.js
+++ b/scripts/pi-hole/js/groups-clients.js
@@ -210,6 +210,7 @@ function initTable() {
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-clients-table");
+      if (data === null) return null;
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/pi-hole/js/groups-domains.js
index 7ec17807..70c01ab8 100644
--- a/scripts/pi-hole/js/groups-domains.js
+++ b/scripts/pi-hole/js/groups-domains.js
@@ -73,7 +73,7 @@ function initTable() {
       { data: "type", searchable: false },
       { data: "enabled", searchable: false },
       { data: "comment" },
-      { data: "groups", searchable: false },
+      { data: "groups", searchable: false, visible: showtype === "all" },
       { data: null, width: "80px", orderable: false }
     ],
     drawCallback: function () {
@@ -251,6 +251,7 @@ function initTable() {
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-domains-table");
+      if (data === null) return null;
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Show group assignment column only on full page
diff --git a/scripts/pi-hole/js/groups.js b/scripts/pi-hole/js/groups.js
index 306ca3d8..677aa5b2 100644
--- a/scripts/pi-hole/js/groups.js
+++ b/scripts/pi-hole/js/groups.js
@@ -91,6 +91,7 @@ $(document).ready(function () {
     },
     stateLoadCallback: function () {
       var data = utils.stateLoadCallback("groups-table");
+      if (data === null) return null;
       // Reset visibility of ID column
       data.columns[0].visible = false;
       // Apply loaded state to table