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

merge branch '6.2.0' into '7.0.0'

Browse Source
This commit is contained in:
Stephan
2013-09-12 12:35:43 +02:00
parent 7642619407 67a632aa43
commit d1af20424e
48 changed files with 864 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Trees/Menu/MenuItemExtensions.cs
View File

@@ -65,10 +65,10 @@ namespace Umbraco.Web.Trees.Menu
{
//First try to get a URL/title from the legacy action,
// if that doesn't work, try to get the legacy confirm view
Attempt<LegacyTreeDataConverter.LegacyUrlAction>
Attempt
.Try(LegacyTreeDataConverter.GetUrlAndTitleFromLegacyAction(menuItem.Action, item.Id.ToInvariantString(), nodeType, item.Name, currentSection),
action => menuItem.LaunchDialogUrl(action.Url, action.DialogTitle))
.IfFailed(() => LegacyTreeDataConverter.GetLegacyConfirmView(menuItem.Action, currentSection),
.OnFailure(() => LegacyTreeDataConverter.GetLegacyConfirmView(menuItem.Action, currentSection),
view => menuItem.LaunchDialogView(
view,
ui.GetText("defaultdialogs", "confirmdelete") + " '" + item.Name + "' ?"));