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

Fixes up the resulting casts when invoking extension methods dynamically in our dynamic objects.

Browse Source
This commit is contained in:
Shannon Deminick
2012-11-19 05:47:34 +05:00
parent 48c45447e4
commit ce4c855f00
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/Models/DynamicPublishedContentList.cs
View File

@@ -228,20 +228,21 @@ namespace Umbraco.Web.Models
//need to check the return type and possibly cast if result is from an extension method found
if (attempt.Result.Reason == DynamicInstanceHelper.TryInvokeMemberSuccessReason.FoundExtensionMethod)
{
if (attempt.Result.ObjectResult != null)
//we don't need to cast if the result is already DynamicPublishedContentList
if (attempt.Result.ObjectResult != null && (!(attempt.Result.ObjectResult is DynamicPublishedContentList)))
{
if (attempt.Result.ObjectResult is IPublishedContent)
{
result = new DynamicPublishedContent((IPublishedContent)attempt.Result.ObjectResult);
}
if (attempt.Result.ObjectResult is IEnumerable<IPublishedContent>)
{
result = new DynamicPublishedContentList((IEnumerable<IPublishedContent>)attempt.Result.ObjectResult);
}
if (attempt.Result.ObjectResult is IEnumerable<DynamicPublishedContent>)
else if (attempt.Result.ObjectResult is IEnumerable<DynamicPublishedContent>)
{
result = new DynamicPublishedContentList((IEnumerable<DynamicPublishedContent>)attempt.Result.ObjectResult);
}
else if (attempt.Result.ObjectResult is IEnumerable<IPublishedContent>)
{
result = new DynamicPublishedContentList((IEnumerable<IPublishedContent>)attempt.Result.ObjectResult);
}
}
}
return true;