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

Fixes UI error when there is an unathorized request, fixes NotificationService to accept IContent since that's all it supports

Browse Source
This commit is contained in:
Shannon
2018-10-25 00:28:37 +11:00
parent 81c7a1de78
commit b716ed1964
4 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Services/INotificationService.cs
View File

@@ -22,7 +22,7 @@ namespace Umbraco.Core.Services
/// <param name="http"></param>
/// <param name="createSubject"></param>
/// <param name="createBody"></param>
void SendNotifications(IUser operatingUser, IEnumerable<IUmbracoEntity> entities, string action, string actionName, Uri siteUri,
void SendNotifications(IUser operatingUser, IEnumerable<IContent> entities, string action, string actionName, Uri siteUri,
Func<(IUser user, NotificationEmailSubjectParams subject), string> createSubject,
Func<(IUser user, NotificationEmailBodyParams body, bool isHtml), string> createBody);

10
src/Umbraco.Core/Services/Implement/NotificationService.cs
View File

@@ -66,17 +66,11 @@ namespace Umbraco.Core.Services.Implement
/// <param name="siteUri"></param>
/// <param name="createSubject"></param>
/// <param name="createBody"></param>
/// <remarks>
/// Currently this will only work for Content entities!
/// </remarks>
public void SendNotifications(IUser operatingUser, IEnumerable<IUmbracoEntity> entities, string action, string actionName, Uri siteUri,
public void SendNotifications(IUser operatingUser, IEnumerable<IContent> entities, string action, string actionName, Uri siteUri,
Func<(IUser user, NotificationEmailSubjectParams subject), string> createSubject,
Func<(IUser user, NotificationEmailBodyParams body, bool isHtml), string> createBody)
{
if (entities is IEnumerable<IContent> == false)
throw new NotSupportedException();
var entitiesL = entities as List<IContent> ?? entities.Cast<IContent>().ToList();
var entitiesL = entities.ToList();
//exit if there are no entities
if (entitiesL.Count == 0) return;

7
src/Umbraco.Web.UI.Client/src/common/interceptors/security.interceptor.js
View File

@@ -102,11 +102,8 @@
//It was decided to just put these messages into the normal status messages.
var msg = "Unauthorized access to URL: <br/><i>" + rejection.config.url.split('?')[0] + "</i>";
if (rejection.config.data) {
msg += "<br/> with data: <br/><i>" + angular.toJson(rejection.config.data) + "</i><br/>Contact your administrator for information.";
}
var msg = "Unauthorized access to URL: <br/><i>" + rejection.config.url.split('?')[0] + "</i><br/>Contact your administrator for information.";
notificationsService.error("Authorization error", msg);
}

4
src/Umbraco.Web/Components/NotificationsComponent.cs
View File

@@ -122,7 +122,7 @@ namespace Umbraco.Web.Components
_logger = logger;
}
public void Notify(IAction action, params IUmbracoEntity[] entities)
public void Notify(IAction action, params IContent[] entities)
{
IUser user = null;
if (_umbracoContextAccessor.UmbracoContext != null)
@@ -145,7 +145,7 @@ namespace Umbraco.Web.Components
SendNotification(user, entities, action, _runtimeState.ApplicationUrl);
}
private void SendNotification(IUser sender, IEnumerable<IUmbracoEntity> entities, IAction action, Uri siteUri)
private void SendNotification(IUser sender, IEnumerable<IContent> entities, IAction action, Uri siteUri)
{
if (sender == null) throw new ArgumentNullException(nameof(sender));
if (siteUri == null) throw new ArgumentNullException(nameof(siteUri));