#2810

diff --git a/src/app/Magic/Fields/Model.php b/src/app/Magic/Fields/Model.php
index a3e83fba16c1d9de90d0c402465dd3ed47e5a910..9027522110d6bfe82f3273501fd67b7d6aff4c6f 100644 (file)
--- 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 a069c736afbacb93bcdb7284d740a1b67015df08..0cffde1a797067d21c6f38796bf5b838ec185512 100644 (file)
--- 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 '';
+    }
 }