From ab6925192755c083aa88cdd3c2077e44f3c3454e Mon Sep 17 00:00:00 2001
From: batyrmastyr <smirnov.eo@gmail.com>
Date: Tue, 17 Mar 2020 17:48:06 +0300
Subject: [PATCH] =?UTF-8?q?fix=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=D0=BD=D1=83=D0=B4=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/Settings.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/plugins/Settings.php b/plugins/Settings.php
index 2074946..8037b82 100644
--- a/plugins/Settings.php
+++ b/plugins/Settings.php
@@ -37,7 +37,7 @@ class Settings extends AbstractPlugin
     public $activeColumns;
 
     /** @var string[] */
-    public $forceColumns;
+    public $forceColumns = [];
     /**
      * @var string
      */
@@ -66,7 +66,6 @@ protected function initFromStorage()
             if (isset($settings['columns'])) {
                 $this->activeColumns = $settings['columns'];
             }
-            $this->activeColumns = array_merge($this->activeColumns, $this->forceColumns ?: []);
         }
     }
 
@@ -103,7 +102,10 @@ public function initColumns()
                 if (!empty($id) && !empty($label)) {
                     $this->columnLabels[$id] = $label;
 
-                    if (is_array($this->activeColumns) && !in_array($id, $this->activeColumns)) {
+                    if (is_array($this->activeColumns)
+                        && !in_array($id, $this->activeColumns)
+                        && !in_array($id, $this->forceColumns)
+                    ) {
                         unset($this->grid->columns[$key]);
                     }
                 }
@@ -112,6 +114,10 @@ public function initColumns()
             if (!is_array($this->activeColumns)) {
                 $this->activeColumns = array_keys($this->columnLabels);
             }
+
+            if ($this->forceColumns) {
+                $this->activeColumns = array_merge($this->activeColumns, $this->forceColumns);
+            }
         }
     }