From 4d13345b14289deb04632507c9f6768187ace84f Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bjarne_fyrstenborg@hotmail.com>
Date: Thu, 30 Mar 2023 09:15:46 +0200
Subject: [PATCH] Support readonly set via `SendingContentNotification`
 (#13557)

* Support readonly set via SendingContentNotification

* Apply changes to second umb-property-editor as well

* Remove check on property.supportsReadOnly

* Disable allow unlock

* Add check on property.readonly

* Small adjustment in the order of preview checks

---------

Co-authored-by: Laura Neto <12862535+lauraneto@users.noreply.github.com>
(cherry picked from commit e30587f90d323f875b0cb7e191195efa85f8743f)
---
 .../views/components/content/umb-tabbed-content.html | 12 ++++++------
 .../propertyeditors/contentpicker/contentpicker.html |  2 +-
 2 files changed, 7 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 8215c66691..c54d692850 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
@@ -18,10 +18,10 @@
                     <umb-property-editor
                         model="property"
                         node="contentNodeModel"
-                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
-                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
+                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
+                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{ !allowUpdate || undefined}}">
+                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
@@ -52,10 +52,10 @@
                     <umb-property-editor
                         model="property"
                         node="contentNodeModel"
-                        preview="(propertyEditorDisabled(property) && allowUpdate) || (!allowUpdate && !property.supportsReadOnly)"
-                        allow-unlock="allowUpdate && allowEditInvariantFromNonDefault"
+                        preview="((property.readonly || !allowUpdate) && !property.supportsReadOnly) || (propertyEditorDisabled(property) && allowUpdate)"
+                        allow-unlock="!property.readonly && allowUpdate && allowEditInvariantFromNonDefault"
                         on-unlock="unlockInvariantValue(property)"
-                        ng-attr-readonly="{{!allowUpdate || undefined}}">
+                        ng-attr-readonly="{{property.readonly || !allowUpdate || undefined}}">
                     </umb-property-editor>
 
                 </umb-property>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
index 086fa3aa7d..6c2f8ba58a 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
@@ -25,7 +25,7 @@
                 ng-click="openCurrentPicker()"
                 id="{{model.alias}}"
                 aria-label="{{model.label}}: {{labels.general_add}}"
-                ng-disabled="readonly">
+                ng-disabled="!allowAdd">
             <localize key="general_add">Add</localize>
             <span class="sr-only">...</span>
         </button>