Fix modules in site

medienbaecker · May 15, 2023 · 404ae15 · 404ae15
1 parent 5b43b01
commit 404ae15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/lib/fields/redirect.php b/lib/fields/redirect.php
@@ -3,11 +3,7 @@
 return [
   'computed' => [
     'redirect' => function () {
-      if ($this->model()->isHomePage()) {
-        return $this->model()->site()->panel()->url();
-      } else {
-        return $this->model()->parent()->panel()->url();
-      }
+      return $this->model()->parents()->count() > 0 ? $this->model()->parents()->first()->panel()->url() : $this->model()->site()->panel()->url();
     }
   ]
 ];
diff --git a/lib/models.php b/lib/models.php
@@ -9,16 +9,19 @@ public static function create(array $props) {
     }
     return parent::create($props);
   }
+  public function parentUrl(): string {
+    return $this->parents()->count() > 0 ? $this->parents()->first()->url() : $this->site()->url();
+  }
   public function url($options = null): string {
-    return $this->parents()->filterBy('intendedTemplate', '!=', 'modules')->first()->url() . '#' . $this->slug();
+    return $this->parentUrl() . '#' . $this->slug();
   }
   public function render(array $data = [], $contentType = 'html'): string {
-    go($this->parents()->filterBy('intendedTemplate', '!=', 'modules')->first()->url() . '#' . $this->slug());
+    go($this->parentUrl() . '#' . $this->slug());
   }
   public function renderModule() {
     $moduleTemplate = new Template($this->intendedTemplate());
     echo $moduleTemplate->render([
-      'page' => $this->parent()->parent(),
+      'page' => $this->parents()->first() ?? $this->site(),
       'module' => $this,
       'site' => $this->site()
     ]);
@@ -29,17 +32,17 @@ public function moduleName() {
   public function moduleId() {
     return str_replace('.', '__', $this->intendedTemplate());
   }
-  public function parents(){
+  public function parents() {
     $parents = parent::parents();
     return $parents->filter('slug', '!=', 'modules');
   }
 }
 
 class ModulesPage extends Page {
   public function url($options = null): string {
-    return $this->parent()->url();
+    return $this->parentUrl();
   }
   public function render(array $data = [], $contentType = 'html'): string {
-    go($this->parent()->url());
+    go($this->parentUrl());
   }
 }
diff --git a/lib/sections/modules.php b/lib/sections/modules.php
@@ -53,7 +53,8 @@
     },
     'image' => false,
     'parent' => function ($parent = null) {
-      return $this->model()->find('modules') ? 'page.find("modules")' : $parent;
+      $class = get_class($this->model()) === 'Kirby\Cms\Site' ? 'site' : 'page';
+      return $this->model()->find('modules') ? $class . '.find("modules")' : $parent;
     },
     'layout' => function (string $layout = 'list') {
       $layouts = ['list', 'cardlets', 'cards', 'table', 'module'];