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

Moved BackOfficeNotificationsController to netcore

Browse Source
This commit is contained in:
Bjarke Berg
2020-05-22 07:26:46 +02:00
parent b5df81fca2
commit e4c8e2009c
4 changed files with 36 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Editors/BackOfficeNotificationsController.cs
View File

@@ -17,7 +17,7 @@ namespace Umbraco.Web.Editors
/// resulting message is INotificationModel in which case it will append any Event Messages
/// currently in the request.
/// </summary>
[AppendCurrentEventMessages]
//[AppendCurrentEventMessages] // Moved to netcore
[PrefixlessBodyModelValidator]
public abstract class BackOfficeNotificationsController : UmbracoAuthorizedJsonController
{

1
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -390,7 +390,6 @@
<Compile Include="WebApi\AngularJsonOnlyConfigurationAttribute.cs" />
<Compile Include="Editors\Binders\MemberBinder.cs" />
<Compile Include="WebApi\Filters\AngularAntiForgeryHelper.cs" />
<Compile Include="WebApi\Filters\AppendCurrentEventMessagesAttribute.cs" />
<Compile Include="WebApi\Filters\ClearAngularAntiForgeryTokenAttribute.cs" />
<Compile Include="WebApi\Filters\DisableBrowserCacheAttribute.cs" />
<Compile Include="WebApi\Filters\EnableOverrideAuthorizationAttribute.cs" />

65
src/Umbraco.Web/WebApi/Filters/AppendCurrentEventMessagesAttribute.cs
View File

@@ -1,65 +0,0 @@
using System;
using System.Net.Http;
using System.Web.Http.Filters;
using Umbraco.Core.Events;
using Umbraco.Web.Composing;
using Umbraco.Web.Models.ContentEditing;
namespace Umbraco.Web.WebApi.Filters
{
/// <summary>
/// Automatically checks if any request is a non-GET and if the
/// resulting message is INotificationModel in which case it will append any Event Messages
/// currently in the request.
/// </summary>
internal sealed class AppendCurrentEventMessagesAttribute : ActionFilterAttribute
{
public override void OnActionExecuted(HttpActionExecutedContext context)
{
if (context.Response == null) return;
if (context.Request.Method == HttpMethod.Get) return;
if (Current.UmbracoContext == null) return;
var obj = context.Response.Content as ObjectContent;
if (obj == null) return;
var notifications = obj.Value as INotificationModel;
if (notifications == null) return;
var msgs = Current.EventMessages;
if (msgs == null) return;
foreach (var eventMessage in msgs.GetAll())
{
NotificationStyle msgType;
switch (eventMessage.MessageType)
{
case EventMessageType.Default:
msgType = NotificationStyle.Save;
break;
case EventMessageType.Info:
msgType = NotificationStyle.Info;
break;
case EventMessageType.Error:
msgType = NotificationStyle.Error;
break;
case EventMessageType.Success:
msgType = NotificationStyle.Success;
break;
case EventMessageType.Warning:
msgType = NotificationStyle.Warning;
break;
default:
throw new ArgumentOutOfRangeException();
}
notifications.Notifications.Add(new BackOfficeNotification
{
Message = eventMessage.Message,
Header = eventMessage.Category,
NotificationType = msgType
});
}
}
}
}