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

Searches on variant nodeName, orders ISearchableTree results by the corresponding tree SortOrder, fixes assembly scanning ISearchableTree

Browse Source
This commit is contained in:
Shannon
2018-12-11 17:51:47 +11:00
parent 5148f34b32
commit eb3841fc0a
7 changed files with 177 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web/Search/SearchableTreeCollection.cs
View File

@@ -19,15 +19,17 @@ namespace Umbraco.Web.Search
private Dictionary<string, SearchableApplicationTree> CreateDictionary(IApplicationTreeService treeService)
{
var appTrees = treeService.GetAll().ToArray();
var appTrees = treeService.GetAll()
.OrderBy(x => x.SortOrder)
.ToArray();
var dictionary = new Dictionary<string, SearchableApplicationTree>();
var searchableTrees = this.ToArray();
foreach (var searchableTree in searchableTrees)
foreach (var appTree in appTrees)
{
var found = appTrees.FirstOrDefault(x => x.Alias == searchableTree.TreeAlias);
var found = searchableTrees.FirstOrDefault(x => x.TreeAlias == appTree.Alias);
if (found != null)
{
dictionary[searchableTree.TreeAlias] = new SearchableApplicationTree(found.ApplicationAlias, found.Alias, searchableTree);
dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.ApplicationAlias, appTree.Alias, found);
}
}
return dictionary;