From 08e97fe2cbfb0105a3f4672f9e165648f69a252b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Mon, 10 Oct 2016 19:03:32 +0200 Subject: [PATCH] Revert "FEATURE: add categories into article detail and article list" This reverts commit bceef69a72c38f576c3180efbaddeddafd0c6fb6. --- modules/Blog/ArticleList/Handlers/ArticleList.php | 2 +- .../views/modules/article/visitor/default.blade.php | 7 ------- .../views/modules/articlelist/visitor/default.blade.php | 8 +------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/modules/Blog/ArticleList/Handlers/ArticleList.php b/modules/Blog/ArticleList/Handlers/ArticleList.php index 2ade7d57..aebdfc36 100644 --- a/modules/Blog/ArticleList/Handlers/ArticleList.php +++ b/modules/Blog/ArticleList/Handlers/ArticleList.php @@ -71,7 +71,7 @@ class ArticleList extends Handler if ($categoryUrl && $categoriesEnabled) { $category = Category::where('url', $categoryUrl) - ->firstOrFail(); + ->first(); $subcategories = $category->getChildren() ->toArray(); diff --git a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php index 69a93026..afdd80d5 100644 --- a/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php +++ b/templates/Binarity/Resources/views/modules/article/visitor/default.blade.php @@ -17,13 +17,6 @@ {{$page->author->name}} - @if($page->category) -
- {{$page->category->name}} -
- @endif - - @if(isset($page->module_settings->allowComments) && $page->module_settings->allowComments != 0)
{{$page->comments->count()}} diff --git a/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php index 4baba499..17b9595a 100644 --- a/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php +++ b/templates/Binarity/Resources/views/modules/articlelist/visitor/default.blade.php @@ -37,14 +37,8 @@ vĂ­ce - @if(isset($article->module_settings->allowComments) && $article->module_settings->allowComments != 0 || $article->category) + @if(isset($article->module_settings->allowComments) && $article->module_settings->allowComments != 0)