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

Merge remote-tracking branch 'origin/temp8' into bugfix/temp8-media-could-not-be-moved-to-root

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/content/move.html
#	src/Umbraco.Web.UI.Client/src/views/media/restore.html
This commit is contained in:
Bjarke Berg
2019-01-16 11:47:13 +01:00
parent a50a46f9fa d0016d6a7e
commit 00158b42e7
1166 changed files with 30779 additions and 35899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web/Models/Trees/MenuItemList.cs
View File

@@ -44,10 +44,11 @@ namespace Umbraco.Web.Models.Trees
/// <typeparam name="T"></typeparam>
/// <param name="hasSeparator"></param>
/// <param name="name">The text to display for the menu item, will default to the IAction alias if not specified</param>
public MenuItem Add<T>(string name, bool hasSeparator = false)
/// <param name="opensDialog">Whether or not this action opens a dialog</param>
public MenuItem Add<T>(string name, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
var item = CreateMenuItem<T>(name, hasSeparator);
var item = CreateMenuItem<T>(name, hasSeparator, opensDialog);
if (item != null)
{
Add(item);
@@ -62,11 +63,11 @@ namespace Umbraco.Web.Models.Trees
/// <typeparam name="T"></typeparam>
/// <param name="hasSeparator"></param>
/// <param name="textService">The <see cref="ILocalizedTextService"/> used to localize the action name based on it's alias</param>
/// <param name="opensDialog"></param>
/// <param name="opensDialog">Whether or not this action opens a dialog</param>
public MenuItem Add<T>(ILocalizedTextService textService, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
var item = CreateMenuItem<T>(textService, hasSeparator);
var item = CreateMenuItem<T>(textService, hasSeparator, opensDialog);
if (item != null)
{
Add(item);
@@ -75,14 +76,15 @@ namespace Umbraco.Web.Models.Trees
return null;
}
internal MenuItem CreateMenuItem<T>(string name, bool hasSeparator = false)
internal MenuItem CreateMenuItem<T>(string name, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
var item = Current.Actions.GetAction<T>();
if (item == null) return null;
var menuItem = new MenuItem(item, name)
{
SeperatorBefore = hasSeparator
SeperatorBefore = hasSeparator,
OpensDialog = opensDialog
};
return menuItem;

3
src/Umbraco.Web/Models/Trees/TreeNode.cs
View File

@@ -2,6 +2,7 @@
using Umbraco.Core.IO;
using System.Collections.Generic;
using Umbraco.Core;
using Umbraco.Core.Composing;
using Umbraco.Core.Configuration;
using Umbraco.Core.Exceptions;
using Umbraco.Web.Models.ContentEditing;
@@ -112,7 +113,7 @@ namespace Umbraco.Web.Models.Trees
return IOHelper.ResolveUrl("~" + Icon.TrimStart('~'));
//legacy icon path
return string.Format("{0}images/umbraco/{1}", UmbracoConfig.For.GlobalSettings().Path.EnsureEndsWith("/"), Icon);
return string.Format("{0}images/umbraco/{1}", Current.Configs.Global().Path.EnsureEndsWith("/"), Icon);
}
}