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

Made @Library.NodeById and @Library.MediaById return DynamicNull when the node was not found, rather than an empty DynamicNode instance with Id == 0 (Which is what NodeFactory returns). To support backwards compatibility, DynamicNull supports .Id == 0 and .Name == "

Browse Source
This commit is contained in:
agrath
2011-10-09 06:43:37 -13:00
parent c7e1350abd
commit 49877c4874
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
umbraco.MacroEngines.Juno/RazorDynamicNode/RazorLibraryCore.cs
View File

@@ -25,19 +25,25 @@ namespace umbraco.MacroEngines.Library
public dynamic NodeById(int Id)
{
return new DynamicNode(Id);
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodeById(string Id)
{
return new DynamicNode(Id);
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodeById(object Id)
{
if (Id.GetType() == typeof(DynamicNull))
{
return Id;
return new DynamicNull();
}
return new DynamicNode(Id);
var node = new DynamicNode(Id);
if (node != null && node.Id == 0) return new DynamicNull();
return node;
}
public dynamic NodesById(List<object> Ids)
{
@@ -67,7 +73,12 @@ namespace umbraco.MacroEngines.Library
public dynamic MediaById(int Id)
{
return new DynamicMedia(new DynamicBackingItem(ExamineBackedMedia.GetUmbracoMedia(Id)));
var ebm = ExamineBackedMedia.GetUmbracoMedia(Id);
if (ebm != null && ebm.Id == 0)
{
return new DynamicNull();
}
return new DynamicMedia(new DynamicBackingItem(ebm));
}
public dynamic MediaById(string Id)
{
@@ -76,13 +87,13 @@ namespace umbraco.MacroEngines.Library
{
return MediaById(mediaId);
}
throw new ArgumentException("Cannot get MediaById without an id");
return new DynamicNull();
}
public dynamic MediaById(object Id)
{
if (Id.GetType() == typeof(DynamicNull))
{
return Id;
return new DynamicNull();
}
int mediaId = 0;
if (int.TryParse(string.Format("{0}", Id), out mediaId))