Merge branch 'main' into issue-31397-broken-vanity-url

dotCMS · Feb 20, 2025 · be2c826 · be2c826
2 parents fb6572f + 7d4e463
commit be2c826
Show file tree

Hide file tree

Showing 11 changed files with 736 additions and 9 deletions.
diff --git a/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/ContentletLoader.java b/dotCMS/src/main/java/com/dotcms/rendering/velocity/services/ContentletLoader.java
@@ -646,9 +646,8 @@ public InputStream writeObject(final VelocityResourceKey key)
             throw new ResourceNotFoundException("cannot find content version info for key: " + key);
         }
 
-        //if time machine is running, we need to force get the latest working version to guarantee the correct rendered content matching the json portion of the response
         final ContentletVersionInfo contentletVersionInfo = info.get();
-        final String inode = (key.mode.showLive && TimeMachineUtil.isNotRunning() )
+        final String inode = key.mode.showLive
                 ? contentletVersionInfo.getLiveInode()
                 : contentletVersionInfo.getWorkingInode();
 

diff --git a/test-karate/src/test/java/graphql/ftm/deleteFolder.feature b/test-karate/src/test/java/graphql/ftm/deleteFolder.feature
@@ -0,0 +1,12 @@
+Feature: Delete a Folder
+  Scenario: Delete a folder on the given path if exists
+    Given url baseUrl + '/api/v1/folder/default'
+    And headers commonHeaders
+    And request
+      """
+      ["#(path)"]
+      """
+    When method DELETE
+    Then status 200
+    * def errors = call extractErrors response
+    * match errors == []