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

---
 src/app/Magic/Models/CMSPage.php                  |  6 ++++++
 src/app/Magic/Models/CubistMagicAbstractModel.php | 12 +++++++++++-
 src/resources/views/fields/button.blade.php       |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index f93660a..c1257ef 100644
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -156,4 +156,10 @@ class CMSPage extends CubistMagicModel
         }
         $controller->updateFieldsFromModel();
     }
+
+    public function update(array $attributes = [], array $options = [])
+    {
+
+       return parent::update($attributes, $options);
+    }
 }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 2e679c5..6b75a2f 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -12,6 +12,7 @@ use Cubist\Backpack\app\Magic\Util;
 use Backpack\CRUD\ModelTraits\SpatieTranslatable\HasTranslations;
 use Backpack\CRUD\ModelTraits\SpatieTranslatable\Sluggable;
 use Backpack\CRUD\ModelTraits\SpatieTranslatable\SluggableScopeHelpers;
+use Cubist\Util\Json;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Illuminate\Database\Eloquent\Model;
@@ -28,7 +29,10 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         replicate as protected replicateSluggable;
     }
     use SluggableScopeHelpers;
-    use HasTranslations;
+    use HasTranslations {
+        update as protected updateTranslations;
+        create as protected createTranslations;
+    }
     use RevisionableTrait;
     use HasMediaTrait;
     use BunchOfFields {
@@ -475,6 +479,12 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         return Media::where('model_id', $this->getKey())->where('model_type', get_class($this))->get();
     }
 
+    public function update(array $attributes = [], array $options = [])
+    {
+        $attributes = Json::decodeRecursive($attributes, Json::TYPE_ARRAY);
+        return $this->updateTranslations($attributes, $options);
+    }
+
     /**
      * @param $controller CubistMagicController
      */
diff --git a/src/resources/views/fields/button.blade.php b/src/resources/views/fields/button.blade.php
index 875a713..694969f 100644
--- a/src/resources/views/fields/button.blade.php
+++ b/src/resources/views/fields/button.blade.php
@@ -14,7 +14,7 @@ if ($value == '') {
 if (is_string($value)) {
     $value = json_decode($value, true);
 }
-$value = array_merge($empty, $value);
+$value = array_merge($empty, \Cubist\Util\ArrayUtil::asArray($value));
 
 ?>
 
-- 
2.39.5