Merge pull request #17 from thelia-modules/feature/homepage

update page template hierarchy
thelia-modules · Mar 14, 2024 · c92ec07 · c92ec07
2 parents 5e6b57c + 90cef0b
commit c92ec07
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -20,7 +20,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
     <authors>
         <author>
             <name>Damien Foulhoux</name>

diff --git a/EventListener/KernelViewListener.php b/EventListener/KernelViewListener.php
@@ -60,11 +60,10 @@ public function onKernelView(ViewEvent $event)
         if ($view === "index") {
             $page = PageQuery::create()
             ->filterByIsHome(1)
-            ->usePageTypeQuery('', Criteria::INNER_JOIN)
-            ->endUse()
             ->findOne();
         }
-
+
+
         if (!$page) {
             return;
         }

diff --git a/Service/PageService.php b/Service/PageService.php
@@ -24,6 +24,15 @@ public function __construct(SmartyParser $parser)
     }
     public function getPageTemplateName(PageModel $page, bool $readCode = true)
     {
+
+        if ($page->isHome()) {
+            $templateName = 'page-home';
+            if ($this->parser->templateExists($templateName.'.html')) {
+                return $templateName;
+            }
+        }
+
+
         if ($readCode) {
             $codeTemplateName = 'page-' . $page->getCode();
             if ($this->parser->templateExists($codeTemplateName.'.html')) {
@@ -37,14 +46,15 @@ public function getPageTemplateName(PageModel $page, bool $readCode = true)
                 return $typeTemplateName;
             }
         }
+
 
         $parent = $page->getParent();
 
         if (null === $parent) {
             return null;
         }
 
-        return $this->getPageTemplateName($parent, false);
+        return $this->getPageTemplateName($parent, true);
     }