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

Fixed possible null reference exceptions

Browse Source
This commit is contained in:
Bjarke Berg
2021-01-14 19:41:32 +01:00
parent 680f8c4d96
commit 04bb4e99b6
32 changed files with 411 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs
View File

@@ -46,7 +46,7 @@ namespace Umbraco.Web.BackOffice.Trees
treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
}
protected override TreeNodeCollection GetTreeNodes(string id, FormCollection queryStrings)
protected override ActionResult<TreeNodeCollection> GetTreeNodes(string id, FormCollection queryStrings)
{
var path = string.IsNullOrEmpty(id) == false && id != Constants.System.RootString
? WebUtility.UrlDecode(id).TrimStart("/")
@@ -93,11 +93,22 @@ namespace Umbraco.Web.BackOffice.Trees
return nodes;
}
protected override TreeNode CreateRootNode(FormCollection queryStrings)
protected override ActionResult<TreeNode> CreateRootNode(FormCollection queryStrings)
{
var root = base.CreateRootNode(queryStrings);
var rootResult = base.CreateRootNode(queryStrings);
if (!(rootResult.Result is null))
{
return rootResult;
}
var root = rootResult.Value;
//check if there are any children
root.HasChildren = GetTreeNodes(Constants.System.RootString, queryStrings).Any();
var treeNodesResult = GetTreeNodes(Constants.System.RootString, queryStrings);
if (!(treeNodesResult.Result is null))
{
return treeNodesResult.Result;
}
root.HasChildren = treeNodesResult.Value.Any();
return root;
}