#26415 include in 23.10.24

dotCMS · Mar 5, 2024 · 8f166f0 · 8f166f0
1 parent 96cdc1b
commit 8f166f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md
@@ -65,4 +65,6 @@ This maintenance release includes the following code fixes:
 58. https://github.com/dotCMS/core/issues/26505 : [UI] - Make AI Image Block Production-ready #26505
 59. https://github.com/dotCMS/core/issues/27155 : Endpoint Change for AI Plugin Detection in dotCMS #27155
 60. https://github.com/dotCMS/core/issues/26853 : [UI] Implement Handle Errors from endpoint #26853
-61. https://github.com/dotCMS/core/issues/25296 : Limited users cannot create content types on System Host #25296
+61. https://github.com/dotCMS/core/issues/25296 : Limited users cannot create content types on System Host #25296
+62. https://github.com/dotCMS/core/issues/26542 : Hide the download button for bundles pushed to static environments #26542
+63. https://github.com/dotCMS/core/issues/26415 : Template Builder: System Template should create layout always #26415
diff --git a/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java b/dotCMS/src/main/java/com/dotcms/rest/api/v1/page/PageResourceHelper.java
@@ -453,7 +453,7 @@ private Template checkoutTemplate(final IHTMLPage page, final User user, final P
                 .anyMatch(pageVersion -> !page.getIdentifier().equals(pageVersion.getIdentifier()) ||
                         !((HTMLPageAsset) page).getVariantId().equals(pageVersion.getVariantName()));
 
-        if (!useByAnotherPage) {
+        if (!useByAnotherPage && !oldTemplate.getIdentifier().equals(Template.SYSTEM_TEMPLATE)) {
             saveTemplate = oldTemplate;
         } else {
             saveTemplate = new Template();