From d08064610f0e711c68266a8490c5cb3abab1d036 Mon Sep 17 00:00:00 2001
From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Fri, 21 Jun 2019 17:41:03 +0200
Subject: [PATCH] #2843

---
 src/app/Magic/Models/CubistMagicAbstractModel.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 912cb04..21ddbe6 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -216,7 +216,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 $this->translatable[] = $store_in;
             }
             $this->fakeColumns[] = $store_in;
-            $field->setAttribute('translatable', false);
         } else {
             if ($field->getAttribute('fillable')) {
                 $this->fillable[] = $name;
@@ -230,15 +229,11 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             if ($field->getAttribute('cast', false) !== false) {
                 $this->casts[$field->getAttribute('name')] = $field->getAttribute('cast');
             }
-            if ($field->getAttribute('set_before_operation', false) !== false) {
-                $this->varSetBeforeOperations[] = $field->getAttribute('name');
+            if ($field->getAttribute('translatable')) {
+                $this->translatable[] = $name;
             }
         }
 
-        if ($field->getAttribute('translatable')) {
-            $this->translatable[] = $name;
-        }
-
 
         return $field;
     }
@@ -285,7 +280,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             'EXTENDS' => $this->_getBaseController(),
             'CLONABLE' => $this->clonable ? 'true' : 'false',
             'BULK' => $this->getOption('bulk', true) ? 'true' : 'false',
-            'VARSETBEFOREOPERATION' => var_export($this->varSetBeforeOperations, true),
         ];
 
         $res = file_get_contents($stub);
@@ -320,7 +314,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
         $table->setPrimaryKey([$this->primaryKey], 'pk_' . $this->table);
 
-
         foreach ($this->_relationships as $relationship) {
             if ($relationship->getRelationship() == 'belongsToMany') {
 
@@ -345,7 +338,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             $field->defineDbColumn($table);
         }
 
-        $this->fakeColumns=array_unique($this->fakeColumns);
+        $this->fakeColumns = array_unique($this->fakeColumns);
         foreach ($this->fakeColumns as $fakeColumn) {
             $table->addColumn($fakeColumn, 'text');
         }
@@ -469,7 +462,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     public function getIdValue()
     {
-        return $this->{$this->getPrimaryKey()};
+        return $this->getKey();
     }
 
 
-- 
2.39.5