Move features

- Introduced IUmbracoFeature
Move Install
Move Tree Items
 - Introduced IMenuItemCollectionFactory - to insure injection of ActionCollection
This commit is contained in:
Bjarke Berg
2020-02-17 14:58:34 +01:00
parent 7a6ded2f6e
commit 43b33f9e6b
74 changed files with 492 additions and 198 deletions

View File

@@ -28,6 +28,8 @@ namespace Umbraco.Web.Trees
{
public abstract class ContentTreeControllerBase : TreeController
{
public IMenuItemCollectionFactory MenuItemCollectionFactory { get; }
protected ContentTreeControllerBase(
IGlobalSettings globalSettings,
@@ -39,9 +41,11 @@ namespace Umbraco.Web.Trees
IRuntimeState runtimeState,
UmbracoHelper umbracoHelper,
UmbracoMapper umbracoMapper,
IPublishedUrlProvider publishedUrlProvider)
IPublishedUrlProvider publishedUrlProvider,
IMenuItemCollectionFactory menuItemCollectionFactory)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper, publishedUrlProvider)
{
MenuItemCollectionFactory = menuItemCollectionFactory;
}
protected ContentTreeControllerBase()
@@ -430,7 +434,7 @@ namespace Umbraco.Web.Trees
deleteAllowed = perms.FirstOrDefault(x => x.Contains(deleteAction.Letter)) != null;
}
var menu = new MenuItemCollection();
var menu = MenuItemCollectionFactory.Create();
// only add empty recycle bin if the current user is allowed to delete by default
if (deleteAllowed)
{