yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes ysod with media types and member types

Browse Source
This commit is contained in:
Shannon
2016-02-03 11:21:01 +01:00
parent ee303957b8
commit 5d5c6ed33a
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web/Editors/EditorModelEventManager.cs
View File

@@ -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<T> : 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<ContentItemDisplay>) e);
OnSendingContentModel(sender, new EditorModelEventArgs<ContentItemDisplay>(e));
}
var mediaItemDisplay = e.Model as MediaItemDisplay;
if (mediaItemDisplay != null)
{
OnSendingMediaModel(sender, (EditorModelEventArgs<MediaItemDisplay>)e);
OnSendingMediaModel(sender, new EditorModelEventArgs<MediaItemDisplay>(e));
}
var memberItemDisplay = e.Model as MemberDisplay;
if (memberItemDisplay != null)
{
OnSendingMemberModel(sender, (EditorModelEventArgs<MemberDisplay>)e);
OnSendingMemberModel(sender, new EditorModelEventArgs<MemberDisplay>(e));
}
}

2
src/Umbraco.Web/WebApi/Filters/OutgoingEditorModelEventAttribute.cs
View File

@@ -26,7 +26,7 @@ namespace Umbraco.Web.WebApi.Filters
if (model != null)
{
EditorModelEventManager.EmitEvent(actionExecutedContext, new EditorModelEventArgs<ContentItemDisplay>(
EditorModelEventManager.EmitEvent(actionExecutedContext, new EditorModelEventArgs(
(dynamic)model,
UmbracoContext.Current));
}