diff --git a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js index 5f192da606..9e7858ea3c 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/tree.service.js @@ -12,7 +12,7 @@ function treeService($q, treeResource, iconHelper, notificationsService, $rootSc var treeArray = []; var standardCssClass = 'icon umb-tree-icon sprTree'; - return { + return { /** Internal method that ensures there's a routePath, parent and level property on each tree node and adds some icon specific properties so that the nodes display properly */ _formatNodeDataForUseInUI: function (parentNode, treeNodes, section, level) { @@ -29,6 +29,8 @@ function treeService($q, treeResource, iconHelper, notificationsService, $rootSc if (treeNodes[i].metaData && treeNodes[i].metaData["treeAlias"]) { //this is a root node treeNodes[i].routePath = section; + //we're going to remove any js callbacks from legacy tree nodes here! + treeNodes[i].metaData["jsClickCallback"] = null; } else { var treeAlias = this.getTreeAlias(treeNodes[i]); diff --git a/src/Umbraco.Web/Trees/ApplicationTreeController.cs b/src/Umbraco.Web/Trees/ApplicationTreeController.cs index 6a4d63af42..9e8ab975d8 100644 --- a/src/Umbraco.Web/Trees/ApplicationTreeController.cs +++ b/src/Umbraco.Web/Trees/ApplicationTreeController.cs @@ -139,7 +139,7 @@ namespace Umbraco.Web.Trees { Children = legacyAttempt.Result }; - sectionRoot.AdditionalData.Add("treeType", Type.GetType(configTree.Type).FullName); + sectionRoot.AdditionalData.Add("treeAlias", configTree.Alias); return sectionRoot; } diff --git a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs index 79d5145d69..dad4c471bb 100644 --- a/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs +++ b/src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs @@ -284,7 +284,7 @@ namespace Umbraco.Web.Trees }; if (isRoot) { - node.AdditionalData.Add("treeType", xmlTreeNode.TreeType); + node.AdditionalData.Add("treeAlias", xmlTreeNode.TreeType); } //This is a special case scenario, we know that content/media works based on the normal Belle routing/editing so we'll ensure we don't