Merge pull request #2 from ithielnor/expose-sorts

Expose sorts

Author: ithielnor

Build/CommonAssemblyInfo.cs

@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.40.0")]
-[assembly: AssemblyFileVersion("1.0.40.0")]
+[assembly: AssemblyVersion("1.0.41.0")]
+[assembly: AssemblyFileVersion("1.0.41.0")]

Build/publish-nuget.ps1

@@ -1,6 +1,8 @@
 # http://www.jeremyskinner.co.uk/2011/01/12/automating-nuget-package-creation-with-msbuild-and-powershell/
 
-msbuild
+$scriptpath = split-path -parent $MyInvocation.MyCommand.Path
+
+msbuild $scriptpath/build.proj
 
 Function Get-DropBox() {
   $hostFile = Join-Path (Split-Path (Get-ItemProperty HKCU:\Software\Dropbox).InstallPath) "host.db"
@@ -10,12 +12,11 @@ Function Get-DropBox() {
 
 $dropbox = Get-DropBox
 $keyfile = "$dropbox\Personal\nuget-key.txt"
-$scriptpath = split-path -parent $MyInvocation.MyCommand.Path
 $nugetpath = resolve-path "$scriptpath/../.nuget/nuget.exe"
 $packagespath = resolve-path "$scriptpath/packages"
 
 if(-not (test-path $keyfile)) {
-  throw "Could not find the NuGet access key at $keyfile. If you're not Chris, you shouldn't be running this script!"
+  throw "Could not find the NuGet access key at $keyfile. If you're not the project owner, you shouldn't be running this script!"
 }
 else {  
   pushd $packagespath

Griddly.Mvc/GriddlyResult.cs

@@ -5,14 +5,38 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using System.Web;
 using System.Web.Helpers;
 using System.Web.Mvc;
 
 namespace Griddly.Mvc
 {
     public abstract class GriddlyResult : ActionResult
     {
+        public SortField[] GetSortFields(NameValueCollection items)
+        {
+            return items.AllKeys
+                .Where(x => x.StartsWith("sortFields["))
+                .Select(x =>
+                {
+                    int pos = x.IndexOf(']', "sortFields[".Length);
+
+                    return new
+                    {
+                        Index = int.Parse(x.Substring("sortFields[".Length, pos - "sortFields[".Length)),
+                        Field = x.Substring(pos + 2, x.Length - pos - 2 - 1),
+                        Direction = (SortDirection)Enum.Parse(typeof(SortDirection), items[x])
+                    };
 
+                })
+                .OrderBy(x => x.Index)
+                .Select(x => new SortField()
+                {
+                    Field = x.Field,
+                    Direction = x.Direction
+                })
+                .ToArray();
+        }
     }
 
     public class GriddlyResult<T> : GriddlyResult
@@ -41,41 +65,26 @@ public override void ExecuteResult(ControllerContext context)
 
             if (!int.TryParse(items["pageNumber"], out pageNumber))
                 pageNumber = 0;
+            
             if (!int.TryParse(items["pageSize"], out pageSize))
                 pageSize = 20;
+
             if (Enum.TryParse(items["exportFormat"], true, out exportFormatValue))
                 exportFormat = exportFormatValue;
             else
                 exportFormat = null;
 
-            sortFields = items.AllKeys
-                .Where(x => x.StartsWith("sortFields["))
-                .Select(x =>
-                {
-                    int pos = x.IndexOf(']', "sortFields[".Length);
-
-                    return new
-                    {
-                        Index = int.Parse(x.Substring("sortFields[".Length, pos - "sortFields[".Length)),
-                        Field = x.Substring(pos + 2, x.Length - pos - 2 - 1),
-                        Direction = (SortDirection)Enum.Parse(typeof(SortDirection), items[x])
-                    };
-
-                })
-                .OrderBy(x => x.Index)
-                .Select(x => new SortField()
-                {
-                    Field = x.Field,
-                    Direction = x.Direction
-                })
-                .ToArray();
+            sortFields = GetSortFields(items);
 
             GriddlySettings settings = null;
 
             if (context.IsChildAction)
             {
                 settings = GriddlySettingsResult.GetSettings(context, ViewName);
 
+                if (GriddlySettings.OnGriddlyResultExecuting != null)
+                    GriddlySettings.OnGriddlyResultExecuting(settings);
+
                 // TODO: should we always pull sort fields?
                 if (!sortFields.Any())
                     sortFields = settings.GetDefaultSort();

Griddly.Mvc/GriddlySettings.cs

@@ -25,6 +25,7 @@ public abstract class GriddlySettings
         public static Func<GriddlyResultPage, object> DefaultFooterTemplate = null;
         public static Func<string, IEnumerable, ActionResult> HandleCustomReport = null;
         public static Action<GriddlySettings> BeforeRender = null;
+        public static Action<GriddlySettings> OnGriddlyResultExecuting = null;
 
         public GriddlySettings()
         {
@@ -131,33 +132,39 @@ public GriddlySettings Button(Func<object, object> argumentTemplate, string capt
             if (enableOnSelection == null)
                 enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
 
-            return Add(new GriddlyButton()
+            var button = new GriddlyButton()
             {
                 ArgumentTemplate = argumentTemplate,
                 Text = caption,
                 Icon = icon,
                 Action = action,
                 EnableOnSelection = enableOnSelection.Value,
-                ClassName = className,
                 Target = target
-            });
+            };
+
+            button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
+
+            return Add(button);
         }
 
         public GriddlySettings Button(string argument, string caption, string icon = null, GriddlyButtonAction action = GriddlyButtonAction.Navigate, bool? enableOnSelection = null, string className = null, string target = null)
         {
             if (enableOnSelection == null)
                 enableOnSelection = (action == GriddlyButtonAction.Ajax || action == GriddlyButtonAction.AjaxBulk || action == GriddlyButtonAction.Post);
 
-            return Add(new GriddlyButton()
+            var button = new GriddlyButton()
             {
                 Argument = argument,
                 Text = caption,
                 Icon = icon,
                 Action = action,
                 EnableOnSelection = enableOnSelection.Value,
-                ClassName = className,
                 Target = target
-            });
+            };
+
+            button.ClassName = ((button.ClassName ?? "") + " " + (className ?? "")).Trim();
+
+            return Add(button);
         }
 
         public GriddlySettings ButtonSeparator()