From 8714fd7433ff653e0fe614ff61768eae57e85aca Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 6 Jun 2019 18:14:46 +0200
Subject: [PATCH] #2810

---
 src/app/Magic/Fields/Field.php           |  2 ++
 src/app/Magic/Fields/Model.php           | 12 +++++++-----
 src/app/Magic/Fields/SelectFromModel.php |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/app/Magic/Fields/Field.php b/src/app/Magic/Fields/Field.php
index cd3af0e..b91a007 100644
--- a/src/app/Magic/Fields/Field.php
+++ b/src/app/Magic/Fields/Field.php
@@ -103,6 +103,8 @@ class Field
 
     public function getColumnData()
     {
+        $this->_postSetAttributes();
+
         $res = [
             'name' => $this->getAttribute('name'),
             'type' => $this->getAttribute('column_type'),
diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index 0543548..a7c8722 100644
--- a/src/app/Magic/Fields/Model.php
+++ b/src/app/Magic/Fields/Model.php
@@ -5,9 +5,13 @@ namespace Cubist\Backpack\app\Magic\Fields;
 
 class Model extends Field
 {
-    public function __construct($attributes)
+    public function getColumnData()
     {
-        parent::__construct($attributes);
+        $res = parent::getColumnData();
+        $res['model'] = $this->getAttribute('model');
+        $res['entity'] = $this->getAttribute('entity');
+        $res['attribute'] = $this->getAttribute('attribute');
+        return $res;
     }
 
     public function getDefaultAttributes()
@@ -17,8 +21,6 @@ class Model extends Field
 
     protected function _postSetAttributes()
     {
-        if (!$this->hasAttribute('entity')) {
-            $this->setAttribute('entity', $this->getAttribute('name'));
-        }
+        $this->setAttributeIfNotSet('entity', 'entity_' . $this->getAttribute('name'));
     }
 }
diff --git a/src/app/Magic/Fields/SelectFromModel.php b/src/app/Magic/Fields/SelectFromModel.php
index a053db0..ea3c9ea 100644
--- a/src/app/Magic/Fields/SelectFromModel.php
+++ b/src/app/Magic/Fields/SelectFromModel.php
@@ -8,6 +8,7 @@ class SelectFromModel extends Model
 {
     protected $_adminType = 'select2';
     protected $_databaseType = 'text';
+    protected $_columnType = 'select';
     protected $_multiple = false;
 
     public function getRelationship()
-- 
2.39.5