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

#2868
---

diff --git a/src/app/Magic/Models/CMSPage.php b/src/app/Magic/Models/CMSPage.php
index e5ed4b9..6c10f6e 100644
--- a/src/app/Magic/Models/CMSPage.php
+++ b/src/app/Magic/Models/CMSPage.php
@@ -152,7 +152,11 @@ class CMSPage extends CubistMagicNestedModel
     public static function getTemplatesById()
     {
         if (null === self::$_templatesById) {
-            self::$_templatesById = DB::table(self::$_table)->get()->pluck('template', 'id');
+            try {
+                self::$_templatesById = DB::table(self::$_table)->get()->pluck('template', 'id');
+            } catch (\Exception $e) {
+                self::$_templatesById = [];
+            }
         }
         return self::$_templatesById;
     }
@@ -200,7 +204,11 @@ class CMSPage extends CubistMagicNestedModel
     public static function getPagesList()
     {
         if (null === static::$_pagesList) {
-            static::$_pagesList = DB::table(self::$_table)->orderBy('lft')->get()->pluck('name', 'id');
+            try {
+                static::$_pagesList = DB::table(self::$_table)->orderBy('lft')->get()->pluck('name', 'id');
+            } catch (Exception $e) {
+                static::$_pagesList = [];
+            }
         }
         return static::$_pagesList;
     }
diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php
index 9787fbb..37ff8d3 100644
--- a/src/app/Magic/Models/CubistMagicAbstractModel.php
+++ b/src/app/Magic/Models/CubistMagicAbstractModel.php
@@ -27,12 +27,12 @@ class CubistMagicAbstractModel extends Model implements HasMedia
     use CrudTrait;
     use Sluggable;
     use SluggableScopeHelpers;
+    use HasMediaTrait;
     use HasTranslations {
         update as protected updateTranslations;
         create as protected createTranslations;
     }
     use RevisionableTrait;
-    use HasMediaTrait;
     use BunchOfFields {
         addField as protected bunchAddField;
     }
@@ -526,4 +526,11 @@ class CubistMagicAbstractModel extends Model implements HasMedia
         return $res;
     }
 
+    public function getMediaInField($c){
+        if(null===$c || !$c){
+            return [];
+        }
+        return $this->getMedia($c);
+    }
+
 }