Merge pull request #412 from hbugdoll/master

Fixed website relation for nav container

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.
 

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']);
     }
 }

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);
         });
     }
 }