diff --git a/src/Umbraco.Web/Actions/ActionRollback.cs b/src/Umbraco.Web/Actions/ActionRollback.cs
index adfdd752cf..96ce1e7767 100644
--- a/src/Umbraco.Web/Actions/ActionRollback.cs
+++ b/src/Umbraco.Web/Actions/ActionRollback.cs
@@ -10,7 +10,9 @@ namespace Umbraco.Web.Actions
///
public class ActionRollback : IAction
{
- public char Letter => 'K';
+ public const char ActionLetter = 'K';
+
+ public char Letter => ActionLetter;
public string Alias => "rollback";
public string Category => Constants.Conventions.PermissionCategories.AdministrationCategory;
public string Icon => "undo";
diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs
index 4a68ca1d91..c1ed76dbc8 100644
--- a/src/Umbraco.Web/Editors/ContentController.cs
+++ b/src/Umbraco.Web/Editors/ContentController.cs
@@ -1761,6 +1761,7 @@ namespace Umbraco.Web.Editors
: content.Variants.FirstOrDefault(x => x.Language.IsoCode == culture);
}
+ [EnsureUserPermissionForContent("contentId", ActionRollback.ActionLetter)]
[HttpPost]
public HttpResponseMessage PostRollbackContent(int contentId, int versionId, string culture = "*")
{
diff --git a/src/Umbraco.Web/Models/Trees/MenuItem.cs b/src/Umbraco.Web/Models/Trees/MenuItem.cs
index dfafa7ce41..4170cdb73f 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItem.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItem.cs
@@ -52,7 +52,6 @@ namespace Umbraco.Web.Models.Trees
SeperatorBefore = false;
Icon = action.Icon;
Action = action;
- OpensDialog = legacyMenu.OpensDialog;
}
#endregion
@@ -87,6 +86,9 @@ namespace Umbraco.Web.Models.Trees
[DataMember(Name = "cssclass")]
public string Icon { get; set; }
+ ///
+ /// Used in the UI to inform the user that the menu item will open a dialog/confirmation
+ ///
[DataMember(Name = "opensDialog")]
public bool OpensDialog { get; set; }
diff --git a/src/Umbraco.Web/Models/Trees/MenuItemList.cs b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
index 672750825c..b34f0b4444 100644
--- a/src/Umbraco.Web/Models/Trees/MenuItemList.cs
+++ b/src/Umbraco.Web/Models/Trees/MenuItemList.cs
@@ -62,7 +62,8 @@ namespace Umbraco.Web.Models.Trees
///
///
/// The used to localize the action name based on it's alias
- public MenuItem Add(ILocalizedTextService textService, bool hasSeparator = false)
+ ///
+ public MenuItem Add(ILocalizedTextService textService, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
var item = CreateMenuItem(textService, hasSeparator);
@@ -87,7 +88,7 @@ namespace Umbraco.Web.Models.Trees
return menuItem;
}
- internal MenuItem CreateMenuItem(ILocalizedTextService textService, bool hasSeparator = false)
+ internal MenuItem CreateMenuItem(ILocalizedTextService textService, bool hasSeparator = false, bool opensDialog = false)
where T : IAction
{
var item = Current.Actions.GetAction();
@@ -95,7 +96,8 @@ namespace Umbraco.Web.Models.Trees
var menuItem = new MenuItem(item, textService.Localize($"actions/{item.Alias}"))
{
- SeperatorBefore = hasSeparator
+ SeperatorBefore = hasSeparator,
+ OpensDialog = opensDialog
};
return menuItem;
diff --git a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
index 01df73f4af..364c9c391f 100644
--- a/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentBlueprintTreeController.cs
@@ -93,7 +93,7 @@ namespace Umbraco.Web.Trees
if (id == Constants.System.Root.ToInvariantString())
{
// root actions
- menu.Items.Add(Services.TextService.Localize($"actions/{ActionNew.ActionAlias}"));
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new RefreshNode(Services.TextService, true));
return menu;
}
@@ -102,7 +102,7 @@ namespace Umbraco.Web.Trees
if (cte != null)
{
var ct = Services.ContentTypeService.Get(cte.Id);
- var createItem = menu.Items.Add(Services.TextService);
+ var createItem = menu.Items.Add(Services.TextService, opensDialog: true);
createItem.NavigateToRoute("/settings/contentBlueprints/edit/-1?create=true&doctype=" + ct.Alias);
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -110,7 +110,7 @@ namespace Umbraco.Web.Trees
return menu;
}
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
return menu;
}
diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs
index a7598e5d3a..1667299436 100644
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -128,9 +128,8 @@ namespace Umbraco.Web.Trees
.Select(x => new MenuItem(x));
//these two are the standard items
- //fixme: inject
- menu.Items.Add(Services.TextService.Localize("actions", ActionNew.ActionAlias));
- menu.Items.Add(Services.TextService.Localize("actions", Current.Actions.GetAction().Alias), true);
+ menu.Items.Add(Services.TextService, opensDialog: true);
+ menu.Items.Add(Services.TextService, true);
//filter the standard items
FilterUserAllowedMenuItems(menu, nodeActions);
@@ -226,25 +225,22 @@ namespace Umbraco.Web.Trees
protected MenuItemCollection GetAllNodeMenuItems(IUmbracoEntity item)
{
var menu = new MenuItemCollection();
- AddActionNode(item, menu);
- AddActionNode(item, menu);
-
- AddActionNode(item, menu);
-
- //need to ensure some of these are converted to the legacy system - until we upgrade them all to be angularized.
- AddActionNode(item, menu, true);
- AddActionNode(item, menu);
-
+ AddActionNode(item, menu, opensDialog: true);
+ AddActionNode(item, menu, opensDialog: true);
+ AddActionNode(item, menu, opensDialog: true);
+ AddActionNode(item, menu, true, opensDialog: true);
+ AddActionNode(item, menu, opensDialog: true);
AddActionNode(item, menu, true);
-
- AddActionNode(item, menu);
- AddActionNode(item, menu);
- AddActionNode(item, menu, true, true);
+ AddActionNode(item, menu, opensDialog: true);
+ AddActionNode(item, menu, opensDialog: true);
+ //fixme - conver this editor to angular
+ AddActionNode(item, menu, true, convert: true, opensDialog: true);
menu.Items.Add(new MenuItem("notify", Services.TextService)
{
Icon = "megaphone",
- SeperatorBefore = true
+ SeperatorBefore = true,
+ OpensDialog = true
});
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -260,8 +256,8 @@ namespace Umbraco.Web.Trees
protected MenuItemCollection GetNodeMenuItemsForDeletedContent(IUmbracoEntity item)
{
var menu = new MenuItemCollection();
- menu.Items.Add(Services.TextService.Localize("actions", ActionRestore.ActionAlias));
- menu.Items.Add(Services.TextService.Localize("actions", ActionDelete.ActionAlias));
+ menu.Items.Add(Services.TextService, opensDialog: true);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -308,12 +304,13 @@ namespace Umbraco.Web.Trees
}
//fixme: Remove the need for converting to legacy
- private void AddActionNode(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false)
+ private void AddActionNode(IUmbracoEntity item, MenuItemCollection menu, bool hasSeparator = false, bool convert = false, bool opensDialog = false)
where TAction : IAction
{
//fixme: Inject
var menuItem = menu.Items.Add(Services.TextService.Localize("actions", Current.Actions.GetAction().Alias), hasSeparator);
if (convert) menuItem.ConvertLegacyMenuItem(item, "content", "content");
+ menuItem.OpensDialog = opensDialog;
}
////fixme: Remove the need for converting to legacy
diff --git a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
index 1398903cfc..646f47068b 100644
--- a/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
@@ -351,7 +351,8 @@ namespace Umbraco.Web.Trees
var menu = new MenuItemCollection();
menu.Items.Add(new MenuItem("emptyRecycleBin", Services.TextService)
{
- Icon = "trash"
+ Icon = "trash",
+ OpensDialog = true
});
menu.Items.Add(new RefreshNode(Services.TextService, true));
return menu;
diff --git a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
index 32367ad02c..43e5b03f2f 100644
--- a/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTypeTreeController.cs
@@ -81,11 +81,12 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.ActionAlias;
// root actions
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new MenuItem("importDocumentType", Services.TextService)
{
Icon = "page-up",
- SeperatorBefore = true
+ SeperatorBefore = true,
+ OpensDialog = true
});
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -98,9 +99,9 @@ namespace Umbraco.Web.Trees
//set the default to create
menu.DefaultMenuAlias = ActionNew.ActionAlias;
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
- menu.Items.Add(new MenuItem("rename", Services.TextService.Localize("actions/rename"))
+ menu.Items.Add(new MenuItem("rename", Services.TextService)
{
Icon = "icon icon-edit"
});
@@ -108,7 +109,7 @@ namespace Umbraco.Web.Trees
if (container.HasChildren == false)
{
//can delete doc type
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
menu.Items.Add(new RefreshNode(Services.TextService, true));
}
@@ -119,20 +120,21 @@ namespace Umbraco.Web.Trees
if (enableInheritedDocumentTypes)
{
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
//no move action if this is a child doc type
if (parent == null)
{
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new MenuItem("export", Services.TextService)
{
Icon = "download-alt",
- SeperatorBefore = true
+ SeperatorBefore = true,
+ OpensDialog = true
});
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
if (enableInheritedDocumentTypes)
menu.Items.Add(new RefreshNode(Services.TextService, true));
}
diff --git a/src/Umbraco.Web/Trees/DataTypeTreeController.cs b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
index 4f9f93f110..6c89f4a1dc 100644
--- a/src/Umbraco.Web/Trees/DataTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/DataTypeTreeController.cs
@@ -104,7 +104,7 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.ActionAlias;
// root actions
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new RefreshNode(Services.TextService, true));
return menu;
}
@@ -115,7 +115,7 @@ namespace Umbraco.Web.Trees
//set the default to create
menu.DefaultMenuAlias = ActionNew.ActionAlias;
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new MenuItem("rename", Services.TextService.Localize("actions/rename"))
{
@@ -125,7 +125,7 @@ namespace Umbraco.Web.Trees
if (container.HasChildren == false)
{
//can delete data type
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
menu.Items.Add(new RefreshNode(Services.TextService, true));
}
@@ -134,9 +134,9 @@ namespace Umbraco.Web.Trees
var nonDeletableSystemDataTypeIds = GetNonDeletableSystemDataTypeIds();
if (nonDeletableSystemDataTypeIds.Contains(int.Parse(id)) == false)
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
- menu.Items.Add(Services.TextService, hasSeparator: true);
+ menu.Items.Add(Services.TextService, hasSeparator: true, opensDialog: true);
}
return menu;
diff --git a/src/Umbraco.Web/Trees/DictionaryTreeController.cs b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
index a0510acd3e..d0a7fce3ad 100644
--- a/src/Umbraco.Web/Trees/DictionaryTreeController.cs
+++ b/src/Umbraco.Web/Trees/DictionaryTreeController.cs
@@ -96,10 +96,10 @@ namespace Umbraco.Web.Trees
{
var menu = new MenuItemCollection();
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
if (id != Constants.System.Root.ToInvariantString())
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
menu.Items.Add(new RefreshNode(Services.TextService, true));
diff --git a/src/Umbraco.Web/Trees/FileSystemTreeController.cs b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
index a517cd45c2..f1e53ed5d4 100644
--- a/src/Umbraco.Web/Trees/FileSystemTreeController.cs
+++ b/src/Umbraco.Web/Trees/FileSystemTreeController.cs
@@ -82,7 +82,7 @@ namespace Umbraco.Web.Trees
//set the default to create
menu.DefaultMenuAlias = ActionNew.ActionAlias;
//create action
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
//refresh action
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -96,7 +96,7 @@ namespace Umbraco.Web.Trees
//set the default to create
menu.DefaultMenuAlias = ActionNew.ActionAlias;
//create action
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
var hasChildren = FileSystem.GetFiles(path).Any() || FileSystem.GetDirectories(path).Any();
@@ -104,7 +104,7 @@ namespace Umbraco.Web.Trees
if (hasChildren == false)
{
//delete action
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
//refresh action
@@ -118,7 +118,7 @@ namespace Umbraco.Web.Trees
var menu = new MenuItemCollection();
//if it's not a directory then we only allow to delete the item
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
return menu;
}
diff --git a/src/Umbraco.Web/Trees/MacrosTreeController.cs b/src/Umbraco.Web/Trees/MacrosTreeController.cs
index 0faa1ce75d..3f925eef8d 100644
--- a/src/Umbraco.Web/Trees/MacrosTreeController.cs
+++ b/src/Umbraco.Web/Trees/MacrosTreeController.cs
@@ -59,7 +59,7 @@ namespace Umbraco.Web.Trees
if (id == Constants.System.Root.ToInvariantString())
{
//Create the normal create action
- menu.Items.Add(Services.TextService)
+ menu.Items.Add(Services.TextService, opensDialog: true)
//Since we haven't implemented anything for macros in angular, this needs to be converted to
//use the legacy format
.ConvertLegacyMenuItem(null, "initmacros", queryStrings.GetValue("application"));
@@ -75,7 +75,7 @@ namespace Umbraco.Web.Trees
if (macro == null) return new MenuItemCollection();
//add delete option for all macros
- menu.Items.Add(Services.TextService)
+ menu.Items.Add(Services.TextService, opensDialog: true)
//Since we haven't implemented anything for macros in angular, this needs to be converted to
//use the legacy format
.ConvertLegacyMenuItem(new EntitySlim
diff --git a/src/Umbraco.Web/Trees/MediaTreeController.cs b/src/Umbraco.Web/Trees/MediaTreeController.cs
index d260253218..0292a907fc 100644
--- a/src/Umbraco.Web/Trees/MediaTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTreeController.cs
@@ -95,7 +95,7 @@ namespace Umbraco.Web.Trees
}
// root actions
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(Services.TextService, true);
menu.Items.Add(new RefreshNode(Services.TextService, true));
return menu;
@@ -119,9 +119,9 @@ namespace Umbraco.Web.Trees
}
//return a normal node menu:
- menu.Items.Add(Services.TextService);
- menu.Items.Add(Services.TextService);
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
+ menu.Items.Add(Services.TextService, opensDialog: true);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(Services.TextService);
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -129,7 +129,10 @@ namespace Umbraco.Web.Trees
if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
{
menu.DefaultMenuAlias = null;
- menu.Items.Insert(2, new MenuItem(Current.Actions.GetAction(), Services.TextService.Localize("actions", ActionRestore.ActionAlias)));
+ menu.Items.Insert(2, new MenuItem(ActionRestore.ActionAlias, Services.TextService)
+ {
+ OpensDialog = true
+ });
}
else
{
diff --git a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
index a679cefa32..547199676a 100644
--- a/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/MediaTypeTreeController.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.ActionAlias;
// root actions
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new RefreshNode(Services.TextService));
return menu;
}
@@ -85,7 +85,7 @@ namespace Umbraco.Web.Trees
//set the default to create
menu.DefaultMenuAlias = ActionNew.ActionAlias;
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
menu.Items.Add(new MenuItem("rename", Services.TextService.Localize("actions/rename"))
{
@@ -95,7 +95,7 @@ namespace Umbraco.Web.Trees
if (container.HasChildren == false)
{
//can delete doc type
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
menu.Items.Add(new RefreshNode(Services.TextService, true));
}
@@ -106,26 +106,26 @@ namespace Umbraco.Web.Trees
if (enableInheritedMediaTypes)
{
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
//no move action if this is a child doc type
if (parent == null)
{
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
}
else
{
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
//no move action if this is a child doc type
if (parent == null)
{
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
}
- menu.Items.Add(Services.TextService);
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
+ menu.Items.Add(Services.TextService, opensDialog: true);
if (enableInheritedMediaTypes)
menu.Items.Add(new RefreshNode(Services.TextService, true));
}
diff --git a/src/Umbraco.Web/Trees/MemberTreeController.cs b/src/Umbraco.Web/Trees/MemberTreeController.cs
index 24fc624110..68819351c0 100644
--- a/src/Umbraco.Web/Trees/MemberTreeController.cs
+++ b/src/Umbraco.Web/Trees/MemberTreeController.cs
@@ -159,17 +159,16 @@ namespace Umbraco.Web.Trees
menu.DefaultMenuAlias = ActionNew.ActionAlias;
//Create the normal create action
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
else
{
//Create a custom create action - this does not launch a dialog, it just navigates to the create screen
// we'll create it based on the ActionNew so it maintains the same icon properties, name, etc...
- var createMenuItem = new MenuItem
+ var createMenuItem = new MenuItem(ActionNew.ActionAlias, Services.TextService)
{
- Name = Services.TextService.Localize($"actions/{ActionNew.ActionAlias}"),
- Alias = ActionNew.ActionAlias,
- Icon = "add"
+ Icon = "add",
+ OpensDialog = true
};
//we want to go to this route: /member/member/edit/-1?create=true
createMenuItem.NavigateToRoute("/member/member/edit/-1?create=true");
@@ -181,7 +180,7 @@ namespace Umbraco.Web.Trees
}
//add delete option for all members
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
if (Security.CurrentUser.HasAccessToSensitiveData())
{
diff --git a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
index 484ea1e2a9..9ea5908891 100644
--- a/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
+++ b/src/Umbraco.Web/Trees/MemberTypeAndGroupTreeControllerBase.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web.Trees
else
{
//delete member type/group
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
return menu;
diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs
index 8f62047941..8158b47985 100644
--- a/src/Umbraco.Web/Trees/PackagesTreeController.cs
+++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs
@@ -84,12 +84,12 @@ namespace Umbraco.Web.Trees
// Root actions
if (id == "-1")
{
- menu.Items.Add(Services.TextService)
+ menu.Items.Add(Services.TextService, opensDialog: true)
.ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application"));
}
else if (id == "created")
{
- menu.Items.Add(Services.TextService)
+ menu.Items.Add(Services.TextService, opensDialog: true)
.ConvertLegacyMenuItem(null, Constants.Trees.Packages, queryStrings.GetValue("application"));
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -97,7 +97,7 @@ namespace Umbraco.Web.Trees
else
{
//it's a package node
- menu.Items.Add(Services.TextService);
+ menu.Items.Add(Services.TextService, opensDialog: true);
}
return menu;
diff --git a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
index ab6e9e2dd7..33ccc152c5 100644
--- a/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
+++ b/src/Umbraco.Web/Trees/RelationTypeTreeController.cs
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Trees
if (id == Constants.System.Root.ToInvariantString())
{
//Create the normal create action
- var addMenuItem = menu.Items.Add(Services.TextService);
+ var addMenuItem = menu.Items.Add(Services.TextService, opensDialog: true);
addMenuItem.LaunchDialogUrl("developer/RelationTypes/NewRelationType.aspx", "Create New RelationType");
//refresh action
menu.Items.Add(new RefreshNode(Services.TextService, true));
@@ -37,7 +37,7 @@ namespace Umbraco.Web.Trees
if (relationType == null) return new MenuItemCollection();
//add delete option for all macros
- menu.Items.Add(Services.TextService)
+ menu.Items.Add(Services.TextService, opensDialog: true)
//Since we haven't implemented anything for relationtypes in angular, this needs to be converted to
//use the legacy format
.ConvertLegacyMenuItem(new EntitySlim
diff --git a/src/Umbraco.Web/Trees/TemplatesTreeController.cs b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
index 3ae45a072e..2339d92d96 100644
--- a/src/Umbraco.Web/Trees/TemplatesTreeController.cs
+++ b/src/Umbraco.Web/Trees/TemplatesTreeController.cs
@@ -70,7 +70,7 @@ namespace Umbraco.Web.Trees
var menu = new MenuItemCollection();
//Create the normal create action
- var item = menu.Items.Add(Services.TextService);
+ var item = menu.Items.Add(Services.TextService, opensDialog: true);
item.NavigateToRoute($"{queryStrings.GetValue("application")}/templates/edit/{id}?create=true");
if (id == Constants.System.Root.ToInvariantString())
@@ -89,7 +89,7 @@ namespace Umbraco.Web.Trees
if (template.IsMasterTemplate == false)
{
//add delete option if it doesn't have children
- menu.Items.Add(Services.TextService, true);
+ menu.Items.Add(Services.TextService, true, opensDialog: true);
}
//add refresh