From 9b52fa215f0eb11f7daa96dbb21e47b8d1b15942 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 11 Dec 2018 12:53:15 +1100
Subject: [PATCH] Allows replacing the model with the outgoing event args

---
 .../Editors/EditorModelEventArgs.cs           | 21 +++++++++++++++----
 .../OutgoingEditorModelEventAttribute.cs      | 11 +++++-----
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/Editors/EditorModelEventArgs.cs b/src/Umbraco.Web/Editors/EditorModelEventArgs.cs
index 153a2d8786..daf262fce5 100644
--- a/src/Umbraco.Web/Editors/EditorModelEventArgs.cs
+++ b/src/Umbraco.Web/Editors/EditorModelEventArgs.cs
@@ -4,9 +4,13 @@ namespace Umbraco.Web.Editors
 {
     public sealed class EditorModelEventArgs<T> : EditorModelEventArgs
     {
+        private readonly EditorModelEventArgs _baseArgs;
+        private T _model;
+
         public EditorModelEventArgs(EditorModelEventArgs baseArgs)
             : base(baseArgs.Model, baseArgs.UmbracoContext)
         {
+            _baseArgs = baseArgs;
             Model = (T)baseArgs.Model;
         }
 
@@ -16,7 +20,16 @@ namespace Umbraco.Web.Editors
             Model = model;
         }
 
-        public new T Model { get; private set; }
+        public new T Model
+        {
+            get => _model;
+            set
+            {
+                _model = value;
+                if (_baseArgs != null)
+                    _baseArgs.Model = _model;
+            }
+        }
     }
 
     public class EditorModelEventArgs : EventArgs
@@ -27,7 +40,7 @@ namespace Umbraco.Web.Editors
             UmbracoContext = umbracoContext;
         }
 
-        public object Model { get; private set; }
-        public UmbracoContext UmbracoContext { get; private set; }
+        public object Model { get; set; }
+        public UmbracoContext UmbracoContext { get; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs
index ec32b61bca..8410891a5d 100644
--- a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs
+++ b/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs
@@ -19,16 +19,17 @@ namespace Umbraco.Web.WebApi.Filters
             var user = UmbracoContext.Current.Security.CurrentUser;
             if (user == null) return;
 
-            var objectContent = actionExecutedContext.Response.Content as ObjectContent;
-            if (objectContent != null)
+            if (actionExecutedContext.Response.Content is ObjectContent objectContent)
             {
                 var model = objectContent.Value;
 
                 if (model != null)
                 {
-                    EditorModelEventManager.EmitEvent(actionExecutedContext, new EditorModelEventArgs(
-                        (dynamic)model,
-                        UmbracoContext.Current));
+                    var args = new EditorModelEventArgs(
+                        model,
+                        UmbracoContext.Current);
+                    EditorModelEventManager.EmitEvent(actionExecutedContext, args);
+                    objectContent.Value = args.Model;
                 }
             }