diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js index 93c9ff8c29..251683edc8 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js @@ -350,6 +350,9 @@ function umbTreeDirective($q, $rootScope, treeService, notificationsService, use if (args.cacheKey) { $scope.cachekey = args.cacheKey; } + if (args.customTreeParams) { + $scope.customtreeparams = args.customTreeParams; + } } //load the tree diff --git a/src/Umbraco.Web/Trees/ContentTreeController.cs b/src/Umbraco.Web/Trees/ContentTreeController.cs index 3581105445..33a347d3d4 100644 --- a/src/Umbraco.Web/Trees/ContentTreeController.cs +++ b/src/Umbraco.Web/Trees/ContentTreeController.cs @@ -178,10 +178,7 @@ namespace Umbraco.Web.Trees return nodeMenu; } - protected override UmbracoObjectTypes UmbracoObjectType - { - get { return UmbracoObjectTypes.Document; } - } + protected override UmbracoObjectTypes UmbracoObjectType => UmbracoObjectTypes.Document; /// /// Returns true or false if the current user has access to the node based on the user's allowed start node (path) access @@ -280,13 +277,19 @@ namespace Umbraco.Web.Trees // we are getting the tree for a given culture, // for those items that DO support cultures, we need to get the proper name, IF it exists - // otherwise, invariant is fine + // otherwise, invariant is fine (with brackets) - if (docEntity.Variations.VariesByCulture() && - docEntity.CultureNames.TryGetValue(culture, out var name) && - !string.IsNullOrWhiteSpace(name)) + if (docEntity.Variations.VariesByCulture()) { - entity.Name = name; + if (docEntity.CultureNames.TryGetValue(culture, out var name) && + !string.IsNullOrWhiteSpace(name)) + { + entity.Name = name; + } + else + { + entity.Name = "(" + entity.Name + ")"; + } } if (string.IsNullOrWhiteSpace(entity.Name))