Handle case where action method returns GriddlyResult subclass

programcsharp · Jan 12, 2024 · b164a67 · b164a67
1 parent 693d9b0
commit b164a67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.6.38")]
-[assembly: AssemblyFileVersion("3.6.38")]
+[assembly: AssemblyVersion("3.6.39")]
+[assembly: AssemblyFileVersion("3.6.39")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]
diff --git a/Griddly.Mvc/GriddlyParameterAttribute.cs b/Griddly.Mvc/GriddlyParameterAttribute.cs
@@ -49,11 +49,11 @@ void OnActionExecuting(ActionExecutingContext filterContext)
             {
 #if NETFRAMEWORK
                 if (filterContext.ActionDescriptor.ActionName.EndsWith("grid", StringComparison.OrdinalIgnoreCase)
-                    || (filterContext.ActionDescriptor as ReflectedActionDescriptor)?.MethodInfo.ReturnType == typeof(GriddlyResult)
-                    || (filterContext.ActionDescriptor as TaskAsyncActionDescriptor)?.TaskMethodInfo.ReturnType == typeof(GriddlyResult))
+                    || typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as ReflectedActionDescriptor)?.MethodInfo.ReturnType)
+                    || typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as TaskAsyncActionDescriptor)?.TaskMethodInfo.ReturnType))
 #else
                 if (filterContext.RouteData.Values["action"].ToString().EndsWith("grid", StringComparison.OrdinalIgnoreCase)
-                    || (filterContext.ActionDescriptor as ControllerActionDescriptor)?.MethodInfo.ReturnType == typeof(GriddlyResult))
+                    || typeof(GriddlyResult).IsAssignableFrom((filterContext.ActionDescriptor as ControllerActionDescriptor)?.MethodInfo.ReturnType))
 #endif
                 {
                     var request = filterContext.HttpContext.Request;