From 8f166f072e7e94cbbcdb4b1f5b80cb9f737519f4 Mon Sep 17 00:00:00 2001 From: erickgonzalez Date: Tue, 5 Mar 2024 12:00:45 -0600 Subject: [PATCH] #26415 include in 23.10.24 --- dotCMS/hotfix_tracking.md | 4 +++- .../java/com/dotcms/rest/api/v1/page/PageResourceHelper.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md index a0dca694faac..181c05ab5f2e 100644 --- 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 \ No newline at end of file +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 \ No newline at end of file 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 index b4a042b0b341..1147cb3fd8ec 100644 --- 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();