Merge branch 'dev' into binarity.cz

modules/Blog/ArticleList/Handlers/ArticleList.php

@@ -10,6 +10,7 @@ use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Input;
+use Modules\Blog\Article\Entities\Article as ArticleModel;
 use Modules\Blog\Article\Handlers\Article;
 use Modules\Categories\Entities\Category;
 
@@ -40,7 +41,9 @@ class ArticleList extends Handler
      */
     public function render(Content $content, $parameters)
     {
-        $articles = Content::where('module_handler', Article::class);
+        $articles = ArticleModel::where('module_handler', Article::class)
+                                ->with('comments')
+                                ->with('category');
 
         // selected category?
 
@@ -98,7 +101,11 @@ class ArticleList extends Handler
         $articles = $articles->orderBy('created_at', 'DESC')
                              ->paginate(20);
 
-        return Controller::VisitorsView($content->template, ['page' => $content, 'articles' => $articles, 'extra' => $parameters]);
+        return Controller::VisitorsView($content->template, [
+            'page'     => $content,
+            'articles' => $articles,
+            'extra'    => $parameters
+        ]);
     }
 
     public static function getModuleId()