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

Merge branch 'temp-U4-10389' into temp-U4-10275

Browse Source
This commit is contained in:
Shannon
2017-09-06 12:03:55 +10:00
parent 6cc4ab9348 8ad1d247fa
commit 8b17d69d32
11 changed files with 155 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
View File

@@ -337,8 +337,9 @@ namespace Umbraco.Web.Trees
internal IEnumerable<MenuItem> GetAllowedUserMenuItemsForNode(IUmbracoEntity dd)
{
var actions = global::umbraco.BusinessLogic.Actions.Action.FromString(UmbracoUser.GetPermissions(dd.Path));
var actions = ActionsResolver.Current.FromActionSymbols(Security.CurrentUser.GetPermissions(dd.Path, Services.UserService))
.ToList();
// A user is allowed to delete their own stuff
if (dd.CreatorId == Security.GetUserId() && actions.Contains(ActionDelete.Instance) == false)
actions.Add(ActionDelete.Instance);