From 2effcf0f3f1bdac8c2f748c8b11baa2f162f8b46 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 22 Oct 2024 18:30:30 +0200
Subject: [PATCH 1/2] Editor: Remove edit template menu item from block
 settings menu in blocks outside template. (#65560)

---
 .../block-settings-menu/content-only-settings-menu.js     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
index fcf7adfa77635c..5a5c64ed3faf84 100644
--- a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
+++ b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
@@ -48,10 +48,14 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 			} else {
 				const { getCurrentTemplateId } = select( editorStore );
 				const templateId = getCurrentTemplateId();
-				const { getContentLockingParent } = unlock(
+				const { getContentLockingParent, getRenderingMode } = unlock(
 					select( blockEditorStore )
 				);
-				if ( ! getContentLockingParent( clientId ) && templateId ) {
+				if (
+					getRenderingMode() === 'template-locked' &&
+					! getContentLockingParent( clientId ) &&
+					templateId
+				) {
 					record = select( coreStore ).getEntityRecord(
 						'postType',
 						'wp_template',

From fab45300483aae1d157eb62c010b09a1fc4f5294 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 22 Oct 2024 18:56:23 +0200
Subject: [PATCH 2/2] get getRenderingMode from correct store

---
 .../block-settings-menu/content-only-settings-menu.js        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
index 5a5c64ed3faf84..e4b6089bf2d92e 100644
--- a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
+++ b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
@@ -46,9 +46,10 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 					getBlockAttributes( patternParent ).ref
 				);
 			} else {
-				const { getCurrentTemplateId } = select( editorStore );
+				const { getCurrentTemplateId, getRenderingMode } =
+					select( editorStore );
 				const templateId = getCurrentTemplateId();
-				const { getContentLockingParent, getRenderingMode } = unlock(
+				const { getContentLockingParent } = unlock(
 					select( blockEditorStore )
 				);
 				if (