From ed77654ffc7c7d08203b22d4cb71a2b676dc1a88 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 6 Jun 2019 19:00:34 +0200
Subject: [PATCH] #2810

---
 src/app/Magic/Fields/Model.php                   | 7 +++++--
 src/app/Magic/Fields/SelectFromModelMultiple.php | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index a3e83fb..9027522 100644
--- a/src/app/Magic/Fields/Model.php
+++ b/src/app/Magic/Fields/Model.php
@@ -21,7 +21,10 @@ class Model extends Field
 
     protected function _postSetAttributes()
     {
-        $prefix = $this->getRelationship() === 'belongsTo' ? 'entity_' : '';
-        $this->setAttributeIfNotSet('entity', $prefix . $this->getAttribute('name'));
+        $this->setAttributeIfNotSet('entity', $this->_getEntityPrefix() . $this->getAttribute('name'));
+    }
+
+    protected function _getEntityPrefix(){
+        return 'entity_';
     }
 }
diff --git a/src/app/Magic/Fields/SelectFromModelMultiple.php b/src/app/Magic/Fields/SelectFromModelMultiple.php
index a069c73..0cffde1 100644
--- a/src/app/Magic/Fields/SelectFromModelMultiple.php
+++ b/src/app/Magic/Fields/SelectFromModelMultiple.php
@@ -17,4 +17,8 @@ class SelectFromModelMultiple extends SelectFromModel
     {
         return array_merge(parent::getDefaultAttributes(), ['fillable' => false, 'pivot' => true]);
     }
+
+    protected function _getEntityPrefix(){
+        return '';
+    }
 }
-- 
2.39.5