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

Ensure the user can still refresh nodes they don't have access to when viewing 'site'/branch nodes with multiple start nodes

Browse Source
This commit is contained in:
Shannon
2017-09-06 10:45:38 +10:00
parent c860069215
commit 6cc4ab9348
4 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/Umbraco.Web/Trees/ContentTreeController.cs
View File

@@ -41,22 +41,8 @@ namespace Umbraco.Web.Trees
[SearchableTree("searchResultFormatter", "configureContentResult")]
public class ContentTreeController : ContentTreeControllerBase, ISearchableTree
{
private readonly UmbracoTreeSearcher _treeSearcher = new UmbracoTreeSearcher();
protected override TreeNode CreateRootNode(FormDataCollection queryStrings)
{
var node = base.CreateRootNode(queryStrings);
// if the user's start node is not default, then ensure the root doesn't have a menu
if (UserStartNodes.Contains(Constants.System.Root) == false)
{
node.MenuUrl = "";
}
node.Name = ui.Text("sections", Constants.Trees.Content);
return node;
}
protected override int RecycleBinId
{
get { return Constants.System.RecycleBinContent; }
@@ -123,14 +109,17 @@ namespace Umbraco.Web.Trees
}
protected override MenuItemCollection PerformGetMenuForNode(string id, FormDataCollection queryStrings)
{
{
if (id == Constants.System.Root.ToInvariantString())
{
var menu = new MenuItemCollection();
// if the user's start node is not the root then ensure the root menu is empty/doesn't exist
// if the user's start node is not the root then the only menu item to display is refresh
if (UserStartNodes.Contains(Constants.System.Root) == false)
{
menu.Items.Add<RefreshNode, ActionRefresh>(
Services.TextService.Localize(string.Concat("actions/", ActionRefresh.Instance.Alias)),
true);
return menu;
}
@@ -174,6 +163,16 @@ namespace Umbraco.Web.Trees
{
throw new HttpResponseException(HttpStatusCode.NotFound);
}
//if the user has no path access for this node, all they can do is refresh
if (Security.CurrentUser.HasPathAccess(item, Services.EntityService, RecycleBinId) == false)
{
var menu = new MenuItemCollection();
menu.Items.Add<RefreshNode, ActionRefresh>(
Services.TextService.Localize(string.Concat("actions/", ActionRefresh.Instance.Alias)),
true);
return menu;
}
var nodeMenu = GetAllNodeMenuItems(item);
var allowedMenuItems = GetAllowedUserMenuItemsForNode(item);