fix обработка принудительных полей

consultnn · Mar 17, 2020 · ab69251 · ab69251
1 parent 68e9179
commit ab69251
Showing 1 changed file with 9 additions and 3 deletions.
diff --git 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);
+            }
         }
     }