Merge branch 'hotfix/v2.3.1'

roadiz · May 22, 2024 · 1876eea · 1876eea
2 parents 353d4f4 + e72289f
commit 1876eea
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to Roadiz will be documented in this file.
 
+## [2.3.1](https://github.com/roadiz/core-bundle-dev-app/compare/v2.3.0...v2.3.1) - 2024-05-22
+
+### Bug Fixes
+
+- **(Node)** Always set node TTL against its node-type - ([a772d06](https://github.com/roadiz/core-bundle-dev-app/commit/a772d065602cf7411ae7a090707e3809f7c6e9f4))
+
 ## [2.3.0](https://github.com/roadiz/core-bundle-dev-app/compare/v2.2.15...v2.3.0) - 2024-05-15
 
 ### ⚠ BREAKING CHANGES

diff --git a/config/api_resources/web_response.yml b/config/api_resources/web_response.yml
@@ -1,6 +1,6 @@
 resources:
     RZ\Roadiz\CoreBundle\Api\Model\WebResponse:
-        graphQlOperations: []
+        graphQlOperations: {  }
         operations:
             article_get_by_path:
                 method: GET

diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.0'
+    roadiz_core.cms_version: '2.3.1'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"

diff --git a/lib/RoadizCoreBundle/src/Node/NodeFactory.php b/lib/RoadizCoreBundle/src/Node/NodeFactory.php
@@ -47,9 +47,10 @@ public function create(
             $node->setNodeType($type);
         }
 
-        if ($type instanceof NodeType) {
-            $node->setTtl($type->getDefaultTtl());
+        if ($node->getNodeType() instanceof NodeType) {
+            $node->setTtl($node->getNodeType()->getDefaultTtl());
         }
+
         if (null !== $parent) {
             $node->setParent($parent);
         }

diff --git a/lib/Rozier/src/Controllers/Nodes/NodesController.php b/lib/Rozier/src/Controllers/Nodes/NodesController.php
@@ -328,6 +328,7 @@ public function addAction(Request $request, int $nodeTypeId, ?int $translationId
 
         $node = new Node();
         $node->setNodeType($type);
+        $node->setTtl($type->getDefaultTtl());
 
         $chroot = $this->nodeChrootResolver->getChroot($this->getUser());
         if (null !== $chroot) {

diff --git a/lib/Rozier/src/Traits/NodesTrait.php b/lib/Rozier/src/Traits/NodesTrait.php
@@ -26,11 +26,9 @@ abstract protected function getNodeFactory(): NodeFactory;
      * @param NodeTypeInterface|null $type
      *
      * @return Node
-     * @throws \Doctrine\ORM\ORMException
-     * @throws \Doctrine\ORM\OptimisticLockException
      */
     protected function createNode(
-        $title,
+        string $title,
         TranslationInterface $translation,
         Node $node = null,
         NodeTypeInterface $type = null

diff --git a/src/Resources/node-types/Article.json b/src/Resources/node-types/Article.json
@@ -93,6 +93,6 @@
             "visible": true
         }
     ],
-    "default_ttl": 0,
+    "default_ttl": 15,
     "searchable": true
 }
diff --git a/src/Resources/node-types/Page.json b/src/Resources/node-types/Page.json
@@ -312,6 +312,6 @@
             "visible": true
         }
     ],
-    "default_ttl": 0,
+    "default_ttl": 15,
     "searchable": true
-}
+}