From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Mon, 8 Jul 2019 18:44:08 +0000 (+0200)
Subject: #2868
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=924eb04e13814af160521ed648724e59c33ffb5a;p=cubist_cms-back.git

#2868
---

diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index 909a13f..e5ed4b9 100644
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -5,6 +5,7 @@ namespace Cubist\Backpack\app\Magic\Models;
 
 use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
 use Cubist\Backpack\app\Template\TemplateAbstract;
+use Cubist\Util\Json;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\Table;
 use Illuminate\Support\Facades\DB;
@@ -208,4 +209,9 @@ class CMSPage extends CubistMagicNestedModel
     {
         return parent::addFakes($columns);
     }
+
+    protected function _prepareData($attributes)
+    {
+        return Json::decodeRecursive(parent::_prepareData($attributes), Json::TYPE_ARRAY);
+    }
 }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 9da9c9d..9787fbb 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -453,7 +453,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     protected function _prepareData($attributes)
     {
-        return Json::decodeRecursive($attributes, Json::TYPE_ARRAY);
+       return $attributes;
     }
 
     public function update(array $attributes = [], array $options = [])
diff --git a/src/resources/views/fields/rangeofvalues.blade.php b/src/resources/views/fields/rangeofvalues.blade.php
index 673d729..b92e887 100644
--- a/src/resources/views/fields/rangeofvalues.blade.php
+++ b/src/resources/views/fields/rangeofvalues.blade.php
@@ -9,6 +9,9 @@ if ($value == '') {
 if (is_string($value)) {
     $value = json_decode($value, true);
 }
+if(is_object($value)){
+    $value=Cubist\Util\ArrayUtil::asArray($value);
+}
 
 if (!isset($value['first'])) {
     $value['first'] = '';
@@ -17,7 +20,6 @@ if (!isset($value['second'])) {
     $value['second'] = '';
 }
 
-
 ?>
 <div @include('crud::inc.field_wrapper_attributes') >
     <label>{!! $field['label'] !!}</label>