fix #4337 【システム】 コンテンツコピー時に layout_template が引き継がれない件を修正

plugins/baser-core/src/Model/Table/ContentFoldersTable.php

@@ -176,7 +176,7 @@ public function copy(int $id, $newParentId, $newTitle, $newAuthorId, $newSiteId)
             'site_id' => $newSiteId,
             'description' => $entity->content->description,
             'eyecatch' => $entity->content->eyecatch,
-            'layout_template' => $entity->content->layout_tmplate ?? ''
+            'layout_template' => $entity->content->layout_template ?? ''
         ]);
         if (!is_null($newSiteId) && $oldEntity->content->site_id !== $newSiteId) {
             $entity->content->parent_id = $this->Contents->copyContentFolderPath($entity->content->url, $newSiteId);

plugins/baser-core/src/Model/Table/PagesTable.php

@@ -277,7 +277,7 @@ public function copy(
             'title' => $newTitle ?? $oldPage->content->title . '_copy',
             'author_id' => $newAuthorId,
             'site_id' => $newSiteId,
-            'layout_template' => $page->content->layout_tmplate ?? ''
+            'layout_template' => $page->content->layout_template ?? ''
         ]);
 
         if (!is_null($newSiteId) && $oldPage->content->site_id !== $newSiteId) {

plugins/baser-core/tests/TestCase/Model/Table/ContentFoldersTableTest.php

@@ -204,6 +204,7 @@ public function test_copy()
 
         //戻り値を確認
         $this->assertEquals('new title', $rs->content->title);
+        $this->assertEquals('default', $rs->content->layout_template);
 
         //DBに存在するか確認すること
         $query = $contentFolders->find()->where(['folder_template' => 'baserCMSサンプル']);

plugins/baser-core/tests/TestCase/Model/Table/PagesTableTest.php

@@ -191,12 +191,16 @@ public function testCopy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId)
         $this->loadFixtureScenario(InitAppScenario::class);
         $this->loadFixtureScenario(PagesScenario::class);
         $this->loadFixtureScenario(ContentsScenario::class);
+        $sourcePage = $this->Pages->get($id, contain: ['Contents']);
+        $contents = $this->getTableLocator()->get('BaserCore.Contents');
+        $contents->updateAll(['layout_template' => 'page_layout'], ['id' => $sourcePage->content->id]);
         $this->loginAdmin($this->getRequest());
         $result = $this->Pages->copy($id, $newParentId, $newTitle, $newAuthorId, $newSiteId);
         $page = $this->Pages->get($result->id, contain: ['Contents' => ['Sites']]);
         $this->assertStringContainsString("_2", $page->content->name);
         $this->assertEquals("hoge1", $page->content->title);
         $this->assertEquals(10, $page->content->author_id);
+        $this->assertEquals('page_layout', $page->content->layout_template);
     }
 
     public static function copyDataProvider()

plugins/bc-content-link/src/Model/Table/ContentLinksTable.php

@@ -109,7 +109,7 @@ public function copy(int $id, $newParentId, $newTitle, $newAuthorId, $newSiteId)
             'site_id' => $newSiteId,
             'description' => $entity->content->description,
             'eyecatch' => $entity->content->eyecatch,
-            'layout_template' => $entity->content->layout_tmplate ?? '',
+            'layout_template' => $entity->content->layout_template ?? '',
             'url' => $entity->content->url
         ]);
         if (!is_null($newSiteId) && $oldEntity->content->site_id !== $newSiteId) {

plugins/bc-content-link/tests/TestCase/Model/Table/ContentLinksTableTest.php

@@ -166,18 +166,22 @@ public function test_copy()
     {
         //データを生成
         $this->loadFixtureScenario(ContentLinksServiceScenario::class);
+        $contents = $this->getTableLocator()->get('BaserCore.Contents');
+        $contents->updateAll(['layout_template' => 'link_layout'], ['id' => 1]);
         //コピーメソッドをコール
         $rs = $this->ContentLinks->copy(1, 2, 'new title', 1, 2);
         //戻る値を確認
         $this->assertEquals('new title', $rs->content->title);
         $this->assertEquals(1, $rs->content->parent_id);
         $this->assertEquals(1, $rs->content->author_id);
         $this->assertEquals(2, $rs->content->site_id);
+        $this->assertEquals('link_layout', $rs->content->layout_template);
         $this->assertEquals(2, $rs->id);
 
         //DBに存在するか確認
         $copiedContentLink = $this->ContentLinks->get(2, contain: ['Contents']);
         //コピー後の url の値の確認
         $this->assertEquals('/new_title', $copiedContentLink->content->url);
+        $this->assertEquals('link_layout', $copiedContentLink->content->layout_template);
     }
 }