From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 13 Jun 2019 17:15:00 +0000 (+0200)
Subject: #2810
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=1e530736e325d7377b3b5b44bdde027e3d6c87f2;p=cubist_cms-back.git

#2810
---

diff --git a/src/app/Magic/Fields/Range.php b/src/app/Magic/Fields/Range.php
index f876143..882c9dd 100644
--- a/src/app/Magic/Fields/Range.php
+++ b/src/app/Magic/Fields/Range.php
@@ -9,13 +9,14 @@ use Cubist\Backpack\CubistBackpackServiceProvider;
 class Range extends Number
 {
     protected $_adminType = 'rangeofvalues';
+    protected $_cast = 'array';
     protected $_viewNamespace = CubistBackpackServiceProvider::NAMESPACE . '::fields';
 
     public function getDefaultAttributes()
     {
         $res = parent::getDefaultAttributes();
-        $res['first_label'] = trans('cubist_back::first_value');
-        $res['second_label'] = trans('cubist_back::second_value');
+        $res['first_label'] = trans('cubist_back::fields.first_value');
+        $res['second_label'] = trans('cubist_back::fields.second_value');
         return $res;
     }
 }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 282370c..b0cd1ab 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -82,6 +82,17 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         $this->fill($attributes);
     }
 
+    public function newFromBuilder($attributes = [], $connection = null)
+    {
+        $res = parent::newFromBuilder($attributes, $connection);
+        $this->onRetreived();
+        return $res;
+    }
+
+    public function onRetreived(){
+
+    }
+
     /**
      * Create translated items as json.
      *
diff --git a/src/resources/views/fields/rangeofvalues.blade.php b/src/resources/views/fields/rangeofvalues.blade.php
index 745adbf..673d729 100644
--- a/src/resources/views/fields/rangeofvalues.blade.php
+++ b/src/resources/views/fields/rangeofvalues.blade.php
@@ -5,6 +5,11 @@ $value = old(square_brackets_to_dots($field['name'])) ?? $field['value'] ?? $fie
 if ($value == '') {
     $value = $empty;
 }
+
+if (is_string($value)) {
+    $value = json_decode($value, true);
+}
+
 if (!isset($value['first'])) {
     $value['first'] = '';
 }