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

Port 7.7 - WIP

Browse Source
This commit is contained in:
Stephan
2017-09-19 15:51:47 +02:00
parent d54658009c
commit 9ed6576908
126 changed files with 3447 additions and 596 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,6 @@ using System.Threading.Tasks;
using System.Web.Http;
using Umbraco.Core.Models;
using Umbraco.Core.Services;
using Umbraco.Web.Composing;
using Umbraco.Web.Models.Trees;
using Umbraco.Web.Mvc;
using Umbraco.Web.WebApi;
@@ -36,7 +35,7 @@ namespace Umbraco.Web.Trees
var rootId = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
//find all tree definitions that have the current application alias
var appTrees = Current.Services.ApplicationTreeService.GetApplicationTrees(application, onlyInitialized).ToArray();
var appTrees = Services.ApplicationTreeService.GetApplicationTrees(application, onlyInitialized).ToArray();
if (appTrees.Length == 1 || string.IsNullOrEmpty(tree) == false )
{
@@ -122,8 +121,8 @@ namespace Umbraco.Web.Trees
//if the root node has a route path, we cannot create a single root section because by specifying the route path this would
//override the dashboard route and that means there can be no dashboard for that section which is a breaking change.
if (string.IsNullOrWhiteSpace(rootNode.Result.RoutePath) == false
&& rootNode.Result.RoutePath != "#"
if (string.IsNullOrWhiteSpace(rootNode.Result.RoutePath) == false
&& rootNode.Result.RoutePath != "#"
&& rootNode.Result.RoutePath != application)
{
//null indicates this cannot be converted