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

Merge branch dev-v7.7 into user-group-permissions

Browse Source
This commit is contained in:
Stephan
2017-07-28 12:54:13 +02:00
parent adac29c655 71a640de74
commit b10d370b16
35 changed files with 1342 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@ namespace Umbraco.Web.Trees
Constants.System.Root.ToString(CultureInfo.InvariantCulture),
queryStrings,
application);
//this will be null if it cannot convert to ta single root section
if (result != null)
return result;
@@ -123,16 +123,16 @@ namespace Umbraco.Web.Trees
//This should really never happen if we've successfully got the children above.
throw new InvalidOperationException("Could not create root node for tree " + configTree.Alias);
}
//if the root node has a route path, we cannot create a single root section because by specifying the route path this would
//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 (rootNode.Result.RoutePath.IsNullOrWhiteSpace() == false
&& rootNode.Result.RoutePath != "#"
if (rootNode.Result.RoutePath.IsNullOrWhiteSpace() == false
&& rootNode.Result.RoutePath != "#"
&& rootNode.Result.RoutePath != application)
{
{
//null indicates this cannot be converted
return null;
}
}
var sectionRoot = SectionRootNode.CreateSingleTreeSectionRoot(
rootId,
@@ -140,10 +140,10 @@ namespace Umbraco.Web.Trees
rootNode.Result.MenuUrl,
rootNode.Result.Name,
byControllerAttempt.Result);
//This can't be done currently because the root will default to routing to a dashboard and if we disable dashboards for a section
//This can't be done currently because the root will default to routing to a dashboard and if we disable dashboards for a section
//that is really considered a breaking change. See above.
//sectionRoot.RoutePath = rootNode.Result.RoutePath;
//sectionRoot.RoutePath = rootNode.Result.RoutePath;
foreach (var d in rootNode.Result.AdditionalData)
{