Skip to content

Commit

Permalink
Pass controller context to handle custom export
Browse files Browse the repository at this point in the history
Version 3.1
  • Loading branch information
ithielnor committed Nov 1, 2018
1 parent dda6548 commit 3b3dc84
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Build/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.7")]
[assembly: AssemblyFileVersion("3.0.7")]
[assembly: AssemblyVersion("3.1.0")]
[assembly: AssemblyFileVersion("3.1.0")]
//[assembly: AssemblyInformationalVersion("2.5-filters")]
2 changes: 1 addition & 1 deletion Griddly.Mvc/GriddlyResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public override void ExecuteResult(ControllerContext context)

if (griddlyContext.ExportFormat == GriddlyExportFormat.Custom)
{
result = GriddlySettings.HandleCustomExport(this, items);
result = GriddlySettings.HandleCustomExport(this, items, context);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion Griddly.Mvc/GriddlySettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static class Icons
///
/// First argument is the record set. Second argument is the posted form values.
/// </summary>
public static Func<GriddlyResult, NameValueCollection, ActionResult> HandleCustomExport = null;
public static Func<GriddlyResult, NameValueCollection, ControllerContext, ActionResult> HandleCustomExport = null;
public static Action<GriddlySettings, GriddlyResultPage, HtmlHelper, bool> OnBeforeRender = null;
public static Action<GriddlySettings, ControllerContext> OnGriddlyResultExecuting = null;
public static Action<GriddlySettings, GriddlyContext, ControllerContext> OnGriddlyPageExecuting = null;
Expand Down
2 changes: 1 addition & 1 deletion Griddly/Controllers/HomeController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Griddly.Controllers
{
public class HomeController : Controller
{
public static ActionResult HandleCustomExport(GriddlyResult result, NameValueCollection form)
public static ActionResult HandleCustomExport(GriddlyResult result, NameValueCollection form, ControllerContext context)
{
return new JsonResult()
{
Expand Down

0 comments on commit 3b3dc84

Please sign in to comment.