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

Merge branch 'dev-v7-pluggable-ISearchableTree' of https://github.com/efabioli/Umbraco-CMS into efabioli-dev-v7-pluggable-ISearchableTree

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
This commit is contained in:
Shannon
2017-05-30 00:48:41 +02:00
parent b0a739b4ac
commit 3ae16e717c
15 changed files with 301 additions and 537 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Trees/ApplicationTreeController.cs
View File

@@ -42,7 +42,7 @@ namespace Umbraco.Web.Trees
//find all tree definitions that have the current application alias
var appTrees = ApplicationContext.Current.Services.ApplicationTreeService.GetApplicationTrees(application, onlyInitialized).ToArray();
if (appTrees.Count() == 1 || string.IsNullOrEmpty(tree) == false )
if (appTrees.Length == 1 || string.IsNullOrEmpty(tree) == false )
{
var apptree = string.IsNullOrEmpty(tree) == false
? appTrees.SingleOrDefault(x => x.Alias == tree)