From: Vincent Vanwaelscappel <vincent@cubedesigners.com>
Date: Thu, 11 Jul 2019 12:25:02 +0000 (+0200)
Subject: #2878
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=b3b3c3019dd6284584f3ffc6e9d54a2fcf0b9e8f;p=cubist_cms-back.git

#2878
---

diff --git a/src/app/Http/Controllers/CubistFrontController.php b/src/app/Http/Controllers/CubistFrontController.php
index b26cc3e..a5efda3 100644
--- a/src/app/Http/Controllers/CubistFrontController.php
+++ b/src/app/Http/Controllers/CubistFrontController.php
@@ -4,6 +4,7 @@
 namespace Cubist\Backpack\app\Http\Controllers;
 
 use App\Models\Page;
+use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\Settings;
 use Illuminate\Routing\Controller as BaseController;
 
@@ -14,6 +15,7 @@ class CubistFrontController extends BaseController
     public function __construct()
     {
         $this->data['global'] = Settings::find(1)->getPageData();
+        $this->data['nav'] = Menu::getNavigation();
     }
 
 
diff --git a/src/app/Http/Controllers/CubistPageController.php b/src/app/Http/Controllers/CubistPageController.php
index ab86203..52fd06b 100644
--- a/src/app/Http/Controllers/CubistPageController.php
+++ b/src/app/Http/Controllers/CubistPageController.php
@@ -5,6 +5,7 @@ namespace Cubist\Backpack\app\Http\Controllers;
 use Cubist\Backpack\app\Magic\Menu\Menu;
 use Cubist\Backpack\app\Magic\Models\CMSPage;
 use Illuminate\Support\Str;
+use Illuminate\View\View;
 
 class CubistPageController extends CubistFrontController
 {
@@ -40,6 +41,6 @@ class CubistPageController extends CubistFrontController
 
         $c = $item->getController();
 
-        return call_user_func_array([app('App\Http\Controllers\\' . $c['controller']), $c['action']], $c['params']);
+        return call_user_func_array([app('App\\Http\\Controllers\\' . $c['controller']), $c['action']], $c['params']);
     }
 }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 474ed8b..5c587f6 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -527,7 +527,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         $res = new PageData();
         $res->setEntity($this);
         foreach ($this->attributes as $key => $value) {
-            $res->set($key, Json::decodeRecursive($value, Json::TYPE_ARRAY));
+            $res->set($key, Json::decodeRecursive($this->getAttributeValue($key), Json::TYPE_ARRAY));
         }
         return $res;
     }