Merge branch 'master' of https://github.com/programcsharp/griddly

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.50.0")]
-[assembly: AssemblyFileVersion("1.0.50.0")]
+[assembly: AssemblyVersion("1.0.60.0")]
+[assembly: AssemblyFileVersion("1.0.70.0")]

Griddly.Mvc/GriddlyButton.cs

@@ -14,6 +14,7 @@ public class GriddlyButton
         public bool IsSeparator { get; set; }
         public bool IsSplitDropdown { get; set; }
         public string Text { get; set; }
+        public string Title { get; set; }
         public string Icon { get; set; }
         public string ClassName { get; set; }
         public string Target { get; set; }

Griddly.Mvc/GriddlyColumn.cs

@@ -135,7 +135,8 @@ public override object RenderCellValue(object row, bool stripHtml = false)
             else if (value is Enum)
                 value = Extensions.ToStringDescription((Enum)value);
             else if (value != null && value.GetType().HasCastOperator<DateTime>())
-                value = (DateTime)value;
+                // value = (DateTime)value; -- BAD: can't unbox a value type as a different type
+                value = Convert.ChangeType(value, typeof(DateTime));
 
             if (stripHtml && value is string)
                 value = HttpUtility.HtmlDecode(_htmlMatch.Replace(value.ToString(), "").Trim().Replace("  ", " "));

Griddly.Mvc/GriddlyExtensions.cs

@@ -108,6 +108,23 @@ public static void SetGriddlyDefault<T>(this Controller controller, ref T parame
             controller.ViewData["_griddlyDefault_" + field] = value;
         }
 
+        public static void SetGriddlyDefault<T>(this Controller controller, ref T[] parameter, string field, IEnumerable<T> value)
+        {
+            if (controller.ControllerContext.IsChildAction)
+                parameter = value.ToArray();
+
+            controller.ViewData["_griddlyDefault_" + field] = value;
+        }
+
+        public static void SetGriddlyDefault<T>(this Controller controller, ref T?[] parameter, string field, IEnumerable<T> value)
+            where T: struct
+        {
+            if (controller.ControllerContext.IsChildAction)
+                parameter = value.Cast<T?>().ToArray();
+
+            controller.ViewData["_griddlyDefault_" + field] = value;
+        }
+
         public static object GetGriddlyDefault(this WebViewPage page, string field)
         {
             return page.ViewData["_griddlyDefault_" + field];
@@ -136,7 +153,9 @@ public static string Current(this UrlHelper helper, object routeValues = null, b
                     if (t.IsPrimitive || t.IsEnum || t == typeof(Decimal) || t == typeof(String) || t == typeof(DateTime) || t == typeof(TimeSpan) || t == typeof(DateTimeOffset))
                         values[value.Key] = value.Value;
                     else if (t.HasCastOperator<DateTime>())
-                        values[value.Key] = (DateTime)value.Value;
+                        // values[value.Key] = (DateTime)value.Value; -- BAD: can't unbox a value type as a different type
+                        values[value.Key] = Convert.ChangeType(value.Value, typeof(DateTime));
+
                 }
             }
 
@@ -157,7 +176,8 @@ public static string Current(this UrlHelper helper, object routeValues = null, b
                         if (t.IsPrimitive || t.IsEnum || t == typeof(Decimal) || t == typeof(String) || t == typeof(DateTime) || t == typeof(TimeSpan) || t == typeof(DateTimeOffset))
                             values[value.Key] = value.Value;
                         else if (t.HasCastOperator<DateTime>())
-                            values[value.Key] = (DateTime)value.Value;
+                            // values[value.Key] = (DateTime)value.Value; -- BAD: can't unbox a value type as a different type
+                            values[value.Key] = Convert.ChangeType(value.Value, typeof(DateTime));
                     }
                 }
             }

Griddly.Mvc/GriddlyFilterExtensions.cs

@@ -111,7 +111,7 @@ static string GetField(GriddlyColumn column)
         public static GriddlyFilterList FilterEnum<T>(this GriddlyColumn column, bool isMultiple = true, bool defaultSelectAll = true, string nullItemText = null, bool isNoneAll = true, string field = null, string caption = null)
             where T : struct
         {
-            return column.FilterList(Extensions.ToSelectListItems<T>(), isMultiple, defaultSelectAll, nullItemText, isNoneAll, field, caption);
+            return column.FilterList(Extensions.ToSelectListItems<T>().OrderBy(x => x.Text), isMultiple, defaultSelectAll, nullItemText, isNoneAll, field, caption);
         }
 
         public static GriddlyFilterList FilterBool(this GriddlyColumn column, string trueLabel = "Yes", string falseLabel = "No", string nullItemText = null, bool isMultiple = false, bool defaultSelectAll = false, bool isNoneAll = false, string field = null, string caption = null)

Griddly.Mvc/GriddlyResult.cs

@@ -86,7 +86,7 @@ public override void ExecuteResult(ControllerContext context)
 
                 // TODO: should we always pull sort fields?
                 if (!sortFields.Any())
-                    sortFields = settings.GetDefaultSort();
+                    sortFields = settings.DefaultSort;
 
                 if (settings.PageSize > settings.MaxPageSize)
                     settings.PageSize = settings.MaxPageSize;

Griddly.Mvc/GriddlySettings.cs

@@ -177,11 +177,23 @@ public GriddlySettings SelectColumn(Func<object, object> id)
             });
         }
 
-        public SortField[] GetDefaultSort()
+        SortField[] _defaultSort;
+
+        public SortField[] DefaultSort
         {
-            return Columns
-                    .Where(x => x.DefaultSort != null)
-                    .Select(x => new SortField() { Field = x.SortField, Direction = x.DefaultSort.Value }).ToArray();
+            get
+            {
+                if (_defaultSort == null)
+                    _defaultSort = Columns
+                        .Where(x => x.DefaultSort != null)
+                        .Select(x => new SortField() { Field = x.SortField, Direction = x.DefaultSort.Value }).ToArray();
+
+                return _defaultSort;
+            }
+            set
+            {
+                _defaultSort = value;
+            }
         }
     }
 

Griddly.Mvc/GriddlySettingsResult.cs

@@ -57,13 +57,12 @@ public static GriddlySettings GetSettings(ControllerContext context, string view
 
                 return settingsResult.Settings;
             }
-            catch (HttpCompileException)
+            catch (HttpException)
             {
                 throw;
             }
-            catch (Exception ex)
+            catch
             {
-                // TODO: throw exception if it is bad like HttpCompileException
                 return null;
             }
         }
@@ -175,6 +174,14 @@ public override NameValueCollection ServerVariables
                     return _serverVariables;
                 }
             }
+
+            public override Uri Url
+            {
+                get
+                {
+                    return new Uri("http://localhost/");
+                }
+            }
         }
 
         class EmptyHttpResponse : HttpResponseBase