From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 24 Jun 2019 13:55:02 +0000 (+0200)
Subject: #2843
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=28a9980b971abb4603f6099f089ca8cc52cc76a1;p=cubist_cms-back.git

#2843
---

diff --git a/src/app/Magic/Controllers/CubistMagicControllerTrait.php b/src/app/Magic/Controllers/CubistMagicControllerTrait.php
index 8478592..fa29ef4 100644
--- a/src/app/Magic/Controllers/CubistMagicControllerTrait.php
+++ b/src/app/Magic/Controllers/CubistMagicControllerTrait.php
@@ -73,8 +73,6 @@ trait CubistMagicControllerTrait
             }
             $this->addField($field);
         }
-
-        $this->crud->updateEntry();
     }
 
 
diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index 9407547..b3ed9ea 100644
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -156,5 +156,4 @@ class CMSPage extends CubistMagicModel
         }
         $controller->updateFieldsFromModel();
     }
-
 }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 21ddbe6..1460251 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -41,7 +41,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
     public $timestamps = true;
     public $clonable = true;
 
-
     /**
      * @var array
      */
@@ -150,6 +149,9 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 'hidden' => true,
                 'fillable' => false]);
         }
+
+        $this->fakeColumns = array_unique($this->fakeColumns);
+        $this->translatable = array_unique($this->translatable);
     }
 
 
@@ -211,7 +213,10 @@ class CubistMagicAbstractModel extends Model implements HasMedia
             if (!in_array($store_in, $this->fillable)) {
                 $this->fillable[] = $store_in;
             }
-            $this->casts[$store_in] = 'array';
+            if (!in_array($name, $this->fillable)) {
+                $this->fillable[] = $name;
+            }
+            //$this->casts[$store_in] = 'array';
             if ($field->getAttribute('translatable')) {
                 $this->translatable[] = $store_in;
             }
@@ -233,8 +238,6 @@ class CubistMagicAbstractModel extends Model implements HasMedia
                 $this->translatable[] = $name;
             }
         }
-
-
         return $field;
     }
 
diff --git a/src/resources/views/fields/text.blade.php b/src/resources/views/fields/text.blade.php
index 8ecfab3..b1a1642 100644
--- a/src/resources/views/fields/text.blade.php
+++ b/src/resources/views/fields/text.blade.php
@@ -1,6 +1,3 @@
-<?php
-print_r($field);
-?>
 <!-- text input -->
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>