From a6e76b524612f065e627d4486ff626cbd474097e Mon Sep 17 00:00:00 2001
From: Hendrik Bugdoll <bugdoll@appsoluteinfach.de>
Date: Mon, 26 Feb 2024 13:35:29 +0100
Subject: [PATCH 1/2] Fixed website relation for nav container

---
 src/models/NavContainer.php           | 5 +++--
 tests/src/models/NavContainerTest.php | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/models/NavContainer.php b/src/models/NavContainer.php
index 6f72f6af..178ed7f1 100644
--- a/src/models/NavContainer.php
+++ b/src/models/NavContainer.php
@@ -11,6 +11,7 @@
 /**
  * Navigation-Containers Model.
  *
+ * @property integer $id
  * @property string $name
  * @property string $alias
  * @property integer $website_id
@@ -58,7 +59,7 @@ public function rules()
     {
         return [
             [['name', 'alias', 'website_id'], 'required'],
-            [['website_id', 'is_deleted', 'website_id'], 'integer'],
+            [['website_id'], 'integer'],
             [['is_deleted'], 'boolean']
         ];
     }
@@ -113,6 +114,6 @@ public function getNavs()
      */
     public function getWebsite()
     {
-        return $this->hasOne(Website::class, ['website_id' => 'id']);
+        return $this->hasOne(Website::class, ['id' => 'website_id']);
     }
 }
diff --git a/tests/src/models/NavContainerTest.php b/tests/src/models/NavContainerTest.php
index 998e67ab..65229612 100644
--- a/tests/src/models/NavContainerTest.php
+++ b/tests/src/models/NavContainerTest.php
@@ -46,6 +46,11 @@ public function testFindWebsiteContainer()
 
             $this->assertEquals(2, $navContainer->website_id);
             $this->assertSame('test container', $navContainer->name);
+
+            $website = $navContainer->website;
+
+            $this->assertEquals(2, $website->id);
+            $this->assertSame('test', $website->name);
         });
     }
 }

From 3afee3ff0278470a2795aaeaa8903a1ba30d6123 Mon Sep 17 00:00:00 2001
From: Hendrik Bugdoll <bugdoll@appsoluteinfach.de>
Date: Mon, 26 Feb 2024 14:06:57 +0100
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 983c5e56..14bc8384 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ In order to read more about upgrading and BC breaks have a look at the [UPGRADE
 
 ## 5.1.1
 
++ [#412](https://github.com/luyadev/luya-module-cms/pull/412) Fixed website relation for nav container (when accessing `navContainer->website`).
 + [#410](https://github.com/luyadev/luya-module-cms/pull/410) Disabled sorting functionality for the "group" extra field in the block CRUD interface due to an exception being thrown. This issue occurred because the field is declared as an `extraAttribute`.
 + [#409](https://github.com/luyadev/luya-module-cms/issues/409) Implemented a new validation check to prevent slug duplication within the same language and navigation hierarchy when creating a new page. This enhancement ensures unique page identification and avoids conflicts in site structure.