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

adds null check to query builder

Browse Source
This commit is contained in:
Shannon
2015-08-11 10:40:18 +02:00
parent 4b7ddb9c15
commit d4863239cd
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Umbraco.Web/Editors/TemplateQueryController.cs
View File

@@ -83,31 +83,31 @@ namespace Umbraco.Web.Editors
{
var targetNode = umbraco.TypedContent(model.Source.Id);
//TODO: Null check!!!!!!!!!!!!
var aliases = this.GetChildContentTypeAliases(targetNode, currentPage).Reverse();
foreach (var contentTypeAlias in aliases)
if (targetNode != null)
{
timer.Start();
var aliases = this.GetChildContentTypeAliases(targetNode, currentPage).Reverse();
pointerNode = pointerNode.FirstChild(x => x.DocumentTypeAlias == contentTypeAlias);
foreach (var contentTypeAlias in aliases)
{
timer.Start();
if (pointerNode == null) break;
pointerNode = pointerNode.FirstChild(x => x.DocumentTypeAlias == contentTypeAlias);
timer.Stop();
sb.AppendFormat(".FirstChild(\"{0}\")", contentTypeAlias);
if (pointerNode == null) break;
timer.Stop();
sb.AppendFormat(".FirstChild(\"{0}\")", contentTypeAlias);
}
if (pointerNode == null || pointerNode.Id != model.Source.Id)
{
// we did not find the path
sb.Clear();
sb.AppendFormat("Umbraco.Content({0})", model.Source.Id);
pointerNode = targetNode;
}
}
if (pointerNode == null || pointerNode.Id != model.Source.Id)
{
// we did not find the path
sb.Clear();
sb.AppendFormat("Umbraco.Content({0})", model.Source.Id);
pointerNode = targetNode;
}
}
// TYPE to return if filtered by type