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

Gets trees and sections loading now in a much more simplified way without any xml, now to cleanup

Browse Source
This commit is contained in:
Shannon
2019-01-17 16:40:11 +11:00
parent 355ac09d90
commit cfe1b17eec
26 changed files with 425 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,13 +14,13 @@ namespace Umbraco.Web.Search
{
private readonly Dictionary<string, SearchableApplicationTree> _dictionary;
public SearchableTreeCollection(IEnumerable<ISearchableTree> items, IApplicationTreeService treeService)
public SearchableTreeCollection(IEnumerable<ISearchableTree> items, ITreeService treeService)
: base(items)
{
_dictionary = CreateDictionary(treeService);
}
private Dictionary<string, SearchableApplicationTree> CreateDictionary(IApplicationTreeService treeService)
private Dictionary<string, SearchableApplicationTree> CreateDictionary(ITreeService treeService)
{
var appTrees = treeService.GetAll()
.OrderBy(x => x.SortOrder)
@@ -29,10 +29,10 @@ namespace Umbraco.Web.Search
var searchableTrees = this.ToArray();
foreach (var appTree in appTrees)
{
var found = searchableTrees.FirstOrDefault(x => x.TreeAlias.InvariantEquals(appTree.Alias));
var found = searchableTrees.FirstOrDefault(x => x.TreeAlias.InvariantEquals(appTree.TreeAlias));
if (found != null)
{
dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.ApplicationAlias, appTree.Alias, found);
dictionary[found.TreeAlias] = new SearchableApplicationTree(appTree.ApplicationAlias, appTree.TreeAlias, found);
}
}
return dictionary;