Merge branch temp8 into temp8-3668-query-builder-snippits

src/Umbraco.Web/Trees/ApplicationTreeController.cs

@@ -215,6 +215,7 @@ namespace Umbraco.Web.Trees
             //assign the route path based on the root node, this means it will route there when the section is navigated to
             //and no dashboards will be available for this section
             sectionRoot.RoutePath = rootNode.Result.RoutePath;
+            sectionRoot.Path = rootNode.Result.Path;
 
             foreach (var d in rootNode.Result.AdditionalData)
             {

src/Umbraco.Web/Trees/MacrosTreeController.cs

@@ -54,7 +54,7 @@ namespace Umbraco.Web.Trees
             {
                 //Create the normal create action
                 menu.Items.Add<ActionNew>(Services.TextService);
-                    
+
                 //refresh action
                 menu.Items.Add(new RefreshNode(Services.TextService, true));
 
@@ -65,16 +65,7 @@ namespace Umbraco.Web.Trees
             if (macro == null) return new MenuItemCollection();
 
             //add delete option for all macros
-            menu.Items.Add<ActionDelete>(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
-                {
-                    Id = macro.Id,
-                    Level = 1,
-                    ParentId = -1,
-                    Name = macro.Name
-                }, "macros", queryStrings.GetValue<string>("application"));
+            menu.Items.Add<ActionDelete>(Services.TextService, opensDialog: true);
 
             return menu;
         }