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

Minor changes to controller methods

Browse Source 
* Renamed from SetNotificationOptions to PostNotificationsOptions
* Ditch CMSNode in the Get method - as we can use the content.path instead
* Use newer ActionsResolver instead of legacy BusinessLogic for getting Actions
This commit is contained in:
Warren
2018-08-07 10:36:09 +01:00
parent 65571f4ee2
commit 7c9652d966
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1159,20 +1159,21 @@ namespace Umbraco.Web.Editors
[EnsureUserPermissionForContent("contentId", 'R')]
public List<NotifySetting> GetNotificationOptions(int contentId)
{
List<NotifySetting> notifications = new List<NotifySetting>();
var notifications = new List<NotifySetting>();
if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var content = Services.ContentService.GetById(contentId);
if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var node = new CMSNode(contentId);
ArrayList actionList = global::umbraco.BusinessLogic.Actions.Action.GetAll();
foreach (global::umbraco.interfaces.IAction a in actionList)
var actionList = ActionsResolver.Current.Actions;
foreach (var a in actionList)
{
if (a.ShowInNotifier)
{
NotifySetting n = new NotifySetting
{
Name = ui.Text("actions", a.Alias),
Checked = (UmbracoUser.GetNotifications(node.Path).IndexOf(a.Letter) > -1),
Checked = (UmbracoUser.GetNotifications(content.Path).IndexOf(a.Letter) > -1),
NotifyCode = a.Letter.ToString()
};
notifications.Add(n);
@@ -1180,12 +1181,15 @@ namespace Umbraco.Web.Editors
}
return notifications;
}
public void SetNotificationOptions(int contentId, string notifyOptions = "")
public void PostNotificationOptions(int contentId, string notifyOptions = "")
{
if (contentId <= 0) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var content = Services.ContentService.GetById(contentId);
if (content == null) throw new HttpResponseException(Request.CreateResponse(HttpStatusCode.NotFound));
var node = new CMSNode(contentId);
global::umbraco.cms.businesslogic.workflow.Notification.UpdateNotifications(UmbracoUser, node, notifyOptions ?? "");
}
}