From 16ae85f2dbf607993275c0c3ddc0adf7b8ee13d7 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 22 Jun 2022 14:53:42 +0200
Subject: [PATCH] only render property editor readonly mode if the property
 editor supports it

---
 .../src/views/components/content/umb-tabbed-content.html  | 8 ++++----
 .../umb-element-editor-content.component.html             | 4 ++--
 .../nestedcontent/nestedcontent.editor.html               | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index 65f8fdf96f..d95b844b16 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -16,10 +16,10 @@
 
                     <umb-property-editor
                         model="property"
-                        preview="propertyEditorDisabled(property) && allowUpdate"
+                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
                         allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{!allowUpdate || undefined}}">
+                        ng-attr-readonly="{{(property.supportsReadOnly && !allowUpdate) || undefined}}">
                     </umb-property-editor>
                     
                 </umb-property>
@@ -48,10 +48,10 @@
 
                     <umb-property-editor
                         model="property"
-                        preview="propertyEditorDisabled(property) && allowUpdate"
+                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
                         on-unlock="unlockInvariantValue(property)"
                         allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
-                        ng-attr-readonly="{{!allowUpdate || undefined}}">
+                        ng-attr-readonly="{{(property.supportsReadOnly && !allowUpdate) || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
index b132038b91..1ec7873f2c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/elementeditor/umb-element-editor-content.component.html
@@ -17,8 +17,8 @@
 
                     <umb-property-editor
                         model="property"
-                        preview="vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue"
-                        ng-attr-readonly="{{!vm.allowUpdate || undefined}}">
+                        preview="(vm.model.variants.length > 1 && !activeVariant.language.isDefault && !property.culture && !property.unlockInvariantValue) || (!vm.allowUpdate && !property.supportsReadOnly)"
+                        ng-attr-readonly="{{(!vm.allowUpdate && property.supportsReadOnly) || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
index df7faf8333..82c385f32f 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
@@ -10,7 +10,8 @@
 
             <umb-property-editor
                 model="property"
-                ng-attr-readonly="{{ readonly || undefined }}">
+                preview="readonly && !property.supportsReadOnly"
+                ng-attr-readonly="{{(readonly && property.supportsReadOnly) || undefined }}">
             </umb-property-editor>
 
         </umb-property>