wip #3297 @0:10

diff --git a/app/Models/News.php b/app/Models/News.php
index c1b8cbf4113ad00a485388b9fbe1ec3e4295dd33..d09a35faa693dd78caa90cee7133899478203de4 100644 (file)
--- a/app/Models/News.php
+++ b/app/Models/News.php
@@ -5,8 +5,9 @@ namespace App\Models;
 use Spatie\Image\Manipulations;
 use Spatie\MediaLibrary\Conversion\Conversion;
 use Spatie\MediaLibrary\Models\Media;
+use Cubist\Backpack\app\Magic\Models\News as BaseNews;
 
-class News extends \Cubist\Backpack\app\Magic\Models\News
+class News extends BaseNews
 {
     public function registerMediaConversions(Media $media = null)
     {

diff --git a/app/Templates/News.php b/app/Templates/News.php
index 9cd43b7f4210cba072aa7d7fd67df851836419f8..54ded81ae124bedd7d5d4a8c1b759e09b79b5893 100644 (file)
--- a/app/Templates/News.php
+++ b/app/Templates/News.php
@@ -24,7 +24,7 @@ class News extends Base
         foreach ($news as $newsItem) {
 
             // Don't include offline items
-            if ($newsItem->status != 1) {
+            if ($newsItem->getPageData()->get('status') != 1) {
                 continue;
             }
 
@@ -57,12 +57,14 @@ class News extends Base
 
         $news = NewsModel::with('media')
             ->where('type', 'news')
-            ->where('status', 1)
             ->whereDate('date', '<=', Carbon::now())
             ->orderBy('date', 'desc')
             ->get();
 
         foreach ($news as $newsItem) {
+            if (!$newsItem->getPageData()->get('status')) {
+                continue;
+            }
             $newsItems[$newsItem->id] = $newsItem;
         }
 
@@ -80,7 +82,6 @@ class News extends Base
         // Get all events
         $events = NewsModel::with('media')
             ->where('type', 'event')
-            ->where('status', 1)
             ->whereDate('date', '<=', $now)
             ->orderBy('event_start', 'asc')
             ->get();
@@ -90,6 +91,9 @@ class News extends Base
         $futureEvents = [];
 
         foreach ($events as $eventItem) {
+            if (!$eventItem->getPageData()->get('status')) {
+                continue;
+            }
             if ($eventItem->event_start < $now && $eventItem->event_end > $now) {
                 $currentEvents[$eventItem->id] = $eventItem;
             } else if ($eventItem->event_start > $now) {