From 06780015d4af1b172147c2ddd47f3f9b678ffda2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 4 Oct 2016 00:44:24 +0200 Subject: [PATCH] FEATURE: create model for articles --- modules/Blog/Article/Entities/Article.php | 15 +++++++++++++++ modules/Blog/ArticleList/Handlers/ArticleList.php | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 modules/Blog/Article/Entities/Article.php diff --git a/modules/Blog/Article/Entities/Article.php b/modules/Blog/Article/Entities/Article.php new file mode 100644 index 00000000..108ee12c --- /dev/null +++ b/modules/Blog/Article/Entities/Article.php @@ -0,0 +1,15 @@ +hasMany(Comment::class, 'content_id') + ->where('approved', true); + } +} \ No newline at end of file diff --git a/modules/Blog/ArticleList/Handlers/ArticleList.php b/modules/Blog/ArticleList/Handlers/ArticleList.php index 84bdbcfe..11ea43c9 100644 --- a/modules/Blog/ArticleList/Handlers/ArticleList.php +++ b/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()