From 51d6850cd6f3743af68b19428e04508b91b3b7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Tue, 6 Sep 2016 12:47:54 +0200 Subject: [PATCH] FEATURE: add selecting comments into template in visitors area --- app/Http/Controllers/Visitor/ContentPage.php | 3 +++ modules/Blog/Article/Handlers/Article.php | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Visitor/ContentPage.php b/app/Http/Controllers/Visitor/ContentPage.php index 6ee4ac70..988bf2b8 100644 --- a/app/Http/Controllers/Visitor/ContentPage.php +++ b/app/Http/Controllers/Visitor/ContentPage.php @@ -50,6 +50,9 @@ class ContentPage extends Controller throw new \Exception('Cannot access protected resources'); } + // decode module settings + $page->module_settings = json_decode($page->module_settings); + // get handler $handler = new $page->module_handler; diff --git a/modules/Blog/Article/Handlers/Article.php b/modules/Blog/Article/Handlers/Article.php index e1fd379c..fefc218d 100644 --- a/modules/Blog/Article/Handlers/Article.php +++ b/modules/Blog/Article/Handlers/Article.php @@ -8,6 +8,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\Request; use App\Models\Content; use App\Models\User; +use Modules\Blog\Article\Entities\Comment; class Article extends Handler { @@ -21,6 +22,14 @@ class Article extends Handler */ public function render(Content $content, $parameters) { + $content->comments = []; + if (isset($content->module_settings->allowComments) && $content->module_settings->allowComments) { + $content->comments = Comment::where('content_id', $content->id) + ->where('approved', 1) + ->orderBy('created_at') + ->get(); + } + return Controller::VisitorsView($content->template, ['page' => $content]); } @@ -79,7 +88,8 @@ class Article extends Handler return $changedColumns; } - public static function getOverviewTitle() { + public static function getOverviewTitle() + { return trans('article::module.allArticles'); }