Merge pull request #50 from MayMeow/dev/fix-front-page

FIXED front page
MayMeow · Oct 16, 2023 · e429fbf · e429fbf
2 parents d325c18 + 4ff4a00
commit e429fbf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Controller/ArticlesController.php b/src/Controller/ArticlesController.php
@@ -48,7 +48,6 @@ public function index(ArticlesManagerServiceInterface $articlesManager, BlogsMan
         $homePage = $articlesManager->getHomePageContent($this->request);
 
         $this->paginate = [
-            'contain' => ['Users', 'Blogs'],
             'order' => ['Articles.created' => 'DESC'],
             'limit' => 10,
         ];

diff --git a/src/Services/ArticlesManagerService.php b/src/Services/ArticlesManagerService.php
@@ -43,13 +43,14 @@ public function getAll(ServerRequest $request, AppController $controller, bool $
     {   
         $blog = $this->articles->Blogs->find()->where(['Blogs.domain' => $request->getUri()->getHost()])->first();
 
+        // if blog exists find only blog's article otherwise find show all
         if ($blog) {
             $articles = $this->articles->find()->contain(['Users', 'Blogs'])->where([
                 'Articles.blog_id' => $blog->id,
                 'Articles.article_type' => $articleType->value,
             ]);
         } else {
-            $articles = $this->articles->find()->where([
+            $articles = $this->articles->find()->contain(['Users', 'Blogs'])->where([
                 'Articles.article_type' => $articleType->value,
             ]);
         }

diff --git a/src/View/Helper/ArticlesHelper.php b/src/View/Helper/ArticlesHelper.php
@@ -46,7 +46,7 @@ protected function getBlogId(ServerRequest $request): ?int
     }
 
     public function isInCurrentBlog(Article $article): bool
-    {
-        return $this->getBlogId($this->getView()->getRequest()) == $article->blog->id ? true : false;
+    {        
+        return $this->getBlogId($this->getView()->getRequest()) == $article->blog?->id ? true : false;
     }
 }