Merge branch 'dev-5' into dev-5.1

baserproject · Feb 27, 2024 · 73f8723 · 73f8723
2 parents 38d8d97 + 593efa0
commit 73f8723
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/plugins/bc-custom-content/src/Controller/CustomContentController.php b/plugins/bc-custom-content/src/Controller/CustomContentController.php
@@ -36,7 +36,11 @@ class CustomContentController extends BcFrontAppController
     public function initialize(): void
     {
         parent::initialize();
-        $this->loadComponent('BaserCore.BcFrontContents', ['viewContentCrumb' => true]);
+        if ($this->getRequest()->getParam('action') === 'index') {
+            $this->loadComponent('BaserCore.BcFrontContents');
+        } else {
+            $this->loadComponent('BaserCore.BcFrontContents', ['viewContentCrumb' => true]);
+        }
     }
 
     /**

diff --git a/plugins/bc-front/templates/plugin/BcCustomContent/CustomContent/default/index.php b/plugins/bc-front/templates/plugin/BcCustomContent/CustomContent/default/index.php
@@ -19,6 +19,8 @@
  * @noTodo
  * @unitTest
  */
+$this->BcBaser->setTitle($customContent->content->title);
+$this->BcBaser->setDescription($customContent->content->description);
 ?>
 
 

diff --git a/plugins/bc-front/templates/plugin/BcCustomContent/CustomContent/default/view.php b/plugins/bc-front/templates/plugin/BcCustomContent/CustomContent/default/view.php
@@ -20,6 +20,7 @@
  * @unitTest
  */
 $customLinks = $this->BcBaser->getCustomLinks($customContent->custom_table_id);
+$this->BcBaser->setTitle($customEntry->title);
 ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ @@
      * @unitTest
      */
     $customLinks = $this->BcBaser->getCustomLinks($customContent->custom_table_id);
+    $this->BcBaser->setTitle($customEntry->title);
     ?>
@@ Expand Down @@