diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs index 0414bc0cdd..44454ca6c3 100644 --- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs +++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs @@ -5,9 +5,9 @@ using Umbraco.Web.Models.ContentEditing; namespace Umbraco.Web.Editors { - public abstract class EditorModelEventArgs : EventArgs + public class EditorModelEventArgs : EventArgs { - protected EditorModelEventArgs(object model, UmbracoContext umbracoContext) + public EditorModelEventArgs(object model, UmbracoContext umbracoContext) { Model = model; UmbracoContext = umbracoContext; @@ -19,6 +19,12 @@ namespace Umbraco.Web.Editors public sealed class EditorModelEventArgs : EditorModelEventArgs { + public EditorModelEventArgs(EditorModelEventArgs baseArgs) + : base(baseArgs.Model, baseArgs.UmbracoContext) + { + Model = (T)baseArgs.Model; + } + public EditorModelEventArgs(T model, UmbracoContext umbracoContext) : base(model, umbracoContext) { @@ -65,19 +71,19 @@ namespace Umbraco.Web.Editors var contentItemDisplay = e.Model as ContentItemDisplay; if (contentItemDisplay != null) { - OnSendingContentModel(sender, (EditorModelEventArgs) e); + OnSendingContentModel(sender, new EditorModelEventArgs(e)); } var mediaItemDisplay = e.Model as MediaItemDisplay; if (mediaItemDisplay != null) { - OnSendingMediaModel(sender, (EditorModelEventArgs)e); + OnSendingMediaModel(sender, new EditorModelEventArgs(e)); } var memberItemDisplay = e.Model as MemberDisplay; if (memberItemDisplay != null) { - OnSendingMemberModel(sender, (EditorModelEventArgs)e); + OnSendingMemberModel(sender, new EditorModelEventArgs(e)); } } diff --git a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs b/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs index 3c74f15b8d..ae10d073cd 100644 --- a/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs +++ b/src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs @@ -26,7 +26,7 @@ namespace Umbraco.Web.WebApi.Filters if (model != null) { - EditorModelEventManager.EmitEvent(actionExecutedContext, new EditorModelEventArgs( + EditorModelEventManager.EmitEvent(actionExecutedContext, new EditorModelEventArgs( (dynamic)model, UmbracoContext.Current)); }