Skip to content

Commit b164a67

Browse files
committed
Handle case where action method returns GriddlyResult subclass
1 parent 693d9b0 commit b164a67

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Build/CommonAssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("3.6.38")]
19-
[assembly: AssemblyFileVersion("3.6.38")]
18+
[assembly: AssemblyVersion("3.6.39")]
19+
[assembly: AssemblyFileVersion("3.6.39")]
2020
//[assembly: AssemblyInformationalVersion("2.5-filters")]

Griddly.Mvc/GriddlyParameterAttribute.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ void OnActionExecuting(ActionExecutingContext filterContext)
4949
{
5050
#if NETFRAMEWORK
5151
if (filterContext.ActionDescriptor.ActionName.EndsWith("grid", StringComparison.OrdinalIgnoreCase)
52-
|| (filterContext.ActionDescriptor as ReflectedActionDescriptor)?.MethodInfo.ReturnType == typeof(GriddlyResult)
53-
|| (filterContext.ActionDescriptor as TaskAsyncActionDescriptor)?.TaskMethodInfo.ReturnType == typeof(GriddlyResult))
52+
|| typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as ReflectedActionDescriptor)?.MethodInfo.ReturnType)
53+
|| typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as TaskAsyncActionDescriptor)?.TaskMethodInfo.ReturnType))
5454
#else
5555
if (filterContext.RouteData.Values["action"].ToString().EndsWith("grid", StringComparison.OrdinalIgnoreCase)
56-
|| (filterContext.ActionDescriptor as ControllerActionDescriptor)?.MethodInfo.ReturnType == typeof(GriddlyResult))
56+
|| typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as ControllerActionDescriptor)?.MethodInfo.ReturnType))
5757
#endif
5858
{
5959
var request = filterContext.HttpContext.Request;

0 commit comments

Comments
 (0)