fix AutoSet never taking into account previously added columns

tabacitu · web-flow · commit bb3e40e833eb · 2021-11-04T10:54:45.000+02:00
diff --git a/src/app/Library/CrudPanel/Traits/AutoSet.php b/src/app/Library/CrudPanel/Traits/AutoSet.php
@@ -32,7 +32,7 @@ public function setFromDb()
                 $this->addField($new_field);
             }
 
-            if (! in_array($field, $this->model->getHidden()) && ! in_array($field, $this->columns())) {
+            if (! in_array($field, $this->model->getHidden()) && ! isset($this->columns()[$field])) {
                 $this->addColumn([
                     'name'    => $field,
                     'label'   => $this->makeLabel($field),

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function setFromDb()`
`32`	`32`	`$this->addField($new_field);`
`33`	`33`	`}`
`34`	`34`
`35`		`- if (! in_array($field, $this->model->getHidden()) && ! in_array($field, $this->columns())) {`
	`35`	`+ if (! in_array($field, $this->model->getHidden()) && ! isset($this->columns()[$field])) {`
`36`	`36`	`$this->addColumn([`
`37`	`37`	`'name' => $field,`
`38`	`38`	`'label' => $this->makeLabel($field),`