#2878

diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index 9fb83fad5828c0ccc9fc54fd59e2b7c7a66bd709..b26cc3e53af75af9e1f8fa92eacb21fce57a49f8 100644 (file)
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -4,9 +4,7 @@
 namespace Cubist\Backpack\app\Http\Controllers;
 
 use App\Models\Page;
-use Cubist\Backpack\app\Magic\Models\CMSPage;
 use Cubist\Backpack\app\Magic\Models\Settings;
-use Cubist\Backpack\app\Magic\PageData;
 use Illuminate\Routing\Controller as BaseController;
 
 class CubistFrontController extends BaseController
@@ -15,23 +13,9 @@ class CubistFrontController extends BaseController
 
     public function __construct()
     {
-        $this->data['global'] = new PageData(Settings::find(1)->withFakes()->getDecodedAttributes());
+        $this->data['global'] = Settings::find(1)->getPageData();
     }
 
-    public function index($slug = 'home')
-    {
-        $class = CMSPage::getPageClass();
-        $page = $class::findBySlug($slug);
-
-        if (!$page) {
-            $this->_404();
-        }
-
-        $this->data['title'] = $page->title;
-        $this->data['page'] = new PageData($page->withFakes()->getDecodedAttributes());
-
-        return view('pages.' . $page->template, $this->data);
-    }
 
     protected function _404()
     {

diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
new file mode 100644 (file)
index 0000000..0317bb8
--- /dev/null
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -0,0 +1,25 @@
+<?php
+
+
+namespace Cubist\Backpack\app\Http\Controllers;
+
+use Cubist\Backpack\app\Magic\Models\CMSPage;
+
+class CubistPageController extends CubistFrontController
+{
+
+    public function index($slug = 'home')
+    {
+        $class = CMSPage::getPageClass();
+        $page = $class::findBySlug($slug);
+
+        if (!$page) {
+            $this->_404();
+        }
+
+        $this->data['title'] = $page->title;
+        $this->data['page'] = $page->getPageData();
+
+        return view('pages.' . $page->template, $this->data);
+    }
+}

diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 37ff8d32bd60facb84a3b110d2b48bad422b1e06..474ed8b1be68e2dc8c17abbe784dd5348011fc1f 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -6,6 +6,7 @@ use Backpack\CRUD\CrudTrait;
 use Cubist\Backpack\app\Magic\BunchOfFields;
 use Cubist\Backpack\app\Magic\Controllers\CubistMagicController;
 use Cubist\Backpack\app\Magic\Fields\Field;
+use Cubist\Backpack\app\Magic\PageData;
 use Cubist\Backpack\app\Magic\Requests\CubistMagicUpdateRequest;
 use Cubist\Backpack\app\Magic\Util;
 use Backpack\CRUD\ModelTraits\SpatieTranslatable\Sluggable;
@@ -453,7 +454,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     protected function _prepareData($attributes)
     {
-       return $attributes;
+        return $attributes;
     }
 
     public function update(array $attributes = [], array $options = [])
@@ -516,18 +517,24 @@ class CubistMagicAbstractModel extends Model implements HasMedia
 
     }
 
-    public function getDecodedAttributes()
+    /**
+     * @return PageData
+     */
+    public function getPageData()
     {
-        $res = new \stdClass();
+        $this->withFakes();
+
+        $res = new PageData();
+        $res->setEntity($this);
         foreach ($this->attributes as $key => $value) {
-            $res->$key = Json::decodeRecursive($this->getAttribute($key), Json::TYPE_OBJECT);
+            $res->set($key, Json::decodeRecursive($value, Json::TYPE_ARRAY));
         }
-        $res->entity = $this;
         return $res;
     }
 
-    public function getMediaInField($c){
-        if(null===$c || !$c){
+    public function getMediaInField($c)
+    {
+        if (null === $c || !$c) {
             return [];
         }
         return $this->getMedia($c);

diff --git a/src/app/Magic/PageData.php b/src/app/Magic/PageData.php
index c9d60da57ddac701fc8063326b44871a903850f9..ecf01842930dfb0382859d4c904b5eb32b598080 100644 (file)
--- a/src/app/Magic/PageData.php
+++ b/src/app/Magic/PageData.php
@@ -4,44 +4,59 @@
 namespace Cubist\Backpack\app\Magic;
 
 
+use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel;
+use Cubist\Backpack\app\Magic\Models\CubistMagicModel;
+use Illuminate\Support\Arr;
+
 class PageData implements \ArrayAccess
 {
+    /**
+     * @var array
+     */
     protected $_data = [];
+    /**
+     * @var CubistMagicAbstractModel
+     */
+    protected $_entity;
+
+    /**
+     * @return CubistMagicModel
+     */
+    public function getEntity(): CubistMagicAbstractModel
+    {
+        return $this->_entity;
+    }
+
+    /**
+     * @param CubistMagicModel $entity
+     */
+    public function setEntity(CubistMagicAbstractModel $entity): void
+    {
+        $this->_entity = $entity;
+    }
 
-    public function __construct($data)
+    public function __construct()
     {
-        if (is_array($data)) {
-            $this->_data = $data;
-            return;
-        }
-        if (is_object($data)) {
-            foreach ($data as $k => $v) {
-                $this->set($k, $v);
-            }
-        }
     }
 
     public function set($offset, $value)
     {
-        $this->_data[$offset] = $value;
+        Arr::set($this->_data, $offset, $value);
     }
 
     public function exists($offset)
     {
-        return isset($this->_data[$offset]) && null !== $this->_data[$offset];
+        return Arr::exists($this->_data, $offset);
     }
 
     public function unset($offset)
     {
-        unset($this->_data[$offset]);
+        Arr::set($this->_data, $offset, null);
     }
 
     public function get($offset, $default = null)
     {
-        if (!$this->exists($offset)) {
-            return $default;
-        }
-        return $this->_data[$offset];
+        return Arr::get($this->_data, $offset, $default);
     }
 
     public function offsetSet($offset, $value)