Merge pull request #2805 from Laravel-Backpack/fix-2797

fixes #2797 - CrudColumn constructor did not guess missing attributes
Laravel-Backpack · May 12, 2020 · b8bb45a · b8bb45a
2 parents e4b7271 + 5c2b1f9
commit b8bb45a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 37 deletions.
diff --git a/src/app/Library/CrudPanel/CrudColumn.php b/src/app/Library/CrudPanel/CrudColumn.php
@@ -32,6 +32,9 @@ public function __construct($name)
             $this->setAttributeValue('name', $name);
         }
 
+        // guess all attributes that weren't explicitly defined
+        $this->attributes = $this->crud()->makeSureColumnHasNeededAttributes($this->attributes);
+
         return $this->save();
     }
 

diff --git a/src/app/Library/CrudPanel/Traits/Columns.php b/src/app/Library/CrudPanel/Traits/Columns.php
@@ -350,6 +350,43 @@ public function firstColumnWhere($attribute, $value)
         });
     }
 
+    /**
+     * The only REALLY MANDATORY attribute for a column is the 'name'.
+     * Everything else, Backpack can probably guess.
+     *
+     * This method checks that all necessary attributes are set.
+     * If not, it tries to guess them.
+     *
+     * @param  string|array $column The column definition array OR column name as string.
+     * @return array                Proper column definition array.
+     */
+    public function makeSureColumnHasNeededAttributes($column)
+    {
+        $column = $this->makeSureColumnHasName($column);
+        $column = $this->makeSureColumnHasLabel($column);
+        $column = $this->makeSureColumnHasType($column);
+        $column = $this->makeSureColumnHasKey($column);
+        $column = $this->makeSureColumnHasModel($column);
+
+        // check if the column exists in the database (as a db column)
+        $columnExistsInDb = $this->hasDatabaseColumn($this->model->getTable(), $column['name']);
+
+        // make sure column has tableColumn, orderable and searchLogic
+        $column['tableColumn'] = $column['tableColumn'] ?? $columnExistsInDb;
+        $column['orderable'] = $column['orderable'] ?? $columnExistsInDb;
+        $column['searchLogic'] = $column['searchLogic'] ?? $columnExistsInDb;
+
+        // check if it's a method on the model,
+        // that means it's a relationship
+        if (! $columnExistsInDb && method_exists($this->model, $column['name'])) {
+            $relatedModel = $this->model->{$column['name']}()->getRelated();
+            $column['entity'] = $column['name'];
+            $column['model'] = get_class($relatedModel);
+        }
+
+        return $column;
+    }
+
     /**
      * Create and return a CrudColumn object for that column name.
      *

diff --git a/src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php b/src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php
@@ -7,43 +7,6 @@
 
 trait ColumnsProtectedMethods
 {
-    /**
-     * The only REALLY MANDATORY attribute for a column is the 'name'.
-     * Everything else, Backpack can probably guess.
-     *
-     * This method checks that all necessary attributes are set.
-     * If not, it tries to guess them.
-     *
-     * @param  string|array $column The column definition array OR column name as string.
-     * @return array                Proper column definition array.
-     */
-    protected function makeSureColumnHasNeededAttributes($column)
-    {
-        $column = $this->makeSureColumnHasName($column);
-        $column = $this->makeSureColumnHasLabel($column);
-        $column = $this->makeSureColumnHasType($column);
-        $column = $this->makeSureColumnHasKey($column);
-        $column = $this->makeSureColumnHasModel($column);
-
-        // check if the column exists in the database (as a db column)
-        $columnExistsInDb = $this->hasDatabaseColumn($this->model->getTable(), $column['name']);
-
-        // make sure column has tableColumn, orderable and searchLogic
-        $column['tableColumn'] = $column['tableColumn'] ?? $columnExistsInDb;
-        $column['orderable'] = $column['orderable'] ?? $columnExistsInDb;
-        $column['searchLogic'] = $column['searchLogic'] ?? $columnExistsInDb;
-
-        // check if it's a method on the model,
-        // that means it's a relationship
-        if (! $columnExistsInDb && method_exists($this->model, $column['name'])) {
-            $relatedModel = $this->model->{$column['name']}()->getRelated();
-            $column['entity'] = $column['name'];
-            $column['model'] = get_class($relatedModel);
-        }
-
-        return $column;
-    }
-
     /**
      * Add a column to the current operation, using the Setting API.
      *