Fix some edge cases

Author: programcsharp

Griddly.Mvc/GriddlyExtensions.cs

@@ -210,6 +210,16 @@ public static void SetGriddlyDefault<T>(this ControllerBase controller, ref T?[]
             }
         }
 
+        public static object GetGriddlyDefault(this WebViewPage page, string field)
+        {
+            object value = null;
+
+            if ((page.ViewData[_contextKey] as GriddlyContext)?.Defaults.TryGetValue(field, out value) != true)
+                value = null;
+
+            return value;
+        }
+
         public static object GetGriddlyParameter(this WebViewPage page, string field)
         {
             object value = null;
@@ -220,6 +230,11 @@ public static object GetGriddlyParameter(this WebViewPage page, string field)
             return value;
         }
 
+        public static int GetGriddlyParameterCount(this WebViewPage page)
+        {
+            return (page.ViewData[_contextKey] as GriddlyContext)?.Parameters.Count ?? 0;
+        }
+
         public static Dictionary<string, object> GetGriddlyDefaults(this WebViewPage page)
         {
             Dictionary<string, object> defaults = new Dictionary<string, object>();

Griddly.Mvc/GriddlyParameterAttribute.cs

@@ -26,20 +26,24 @@ public override void OnActionExecuting(ActionExecutingContext filterContext)
                     string[] parentKeys = request.QueryString.AllKeys;
 
                     // if a param came in on querystring, skip the defaults. cookie already does its own skip.
-                    if (filterContext.ActionParameters.Any(x => x.Value != null && parentKeys.Contains(x.Key)))
+                    if (!context.IsDefaultSkipped && filterContext.ActionParameters.Any(x => x.Value != null && parentKeys.Contains(x.Key)))
                         context.IsDefaultSkipped = true;
 
                     foreach (var param in filterContext.ActionParameters.ToList())
                     {
                         if (param.Value != null)
                         {
+                            bool isParamSet = context.CookieData?.Values?.ContainsKey(param.Key) == true || parentKeys.Contains(param.Key) || filterContext.RouteData.Values.ContainsKey(param.Key);
+
                             // if we're skipping defaults but this didn't come from cookie or querystring, it must've come from a
                             // parameter default in code... nuke it.
-                            if (context.IsDefaultSkipped && !(context.CookieData?.Values?.ContainsKey(param.Key) == true || parentKeys.Contains(param.Key)))
+                            if (context.IsDefaultSkipped && !isParamSet)
                                 filterContext.ActionParameters[param.Key] = null;
                             else
                             {
-                                context.Defaults[param.Key] = param.Value;
+                                if (!context.IsDefaultSkipped || !isParamSet)
+                                    context.Defaults[param.Key] = param.Value;
+
                                 context.Parameters[param.Key] = param.Value;
                             }
                         }

Griddly/Views/Shared/Griddly/Griddly.cshtml

@@ -107,7 +107,7 @@
         return this.GetGriddlyParameter(x.Field) != null || (filterRange != null && this.GetGriddlyParameter(filterRange.FieldEnd) != null);
     });
 
-    bool isDefaultFilter = defaultFilters.Any() == isFiltered
+    bool isDefaultFilter = defaultFilters.Count == this.GetGriddlyParameterCount()
         && defaultFilters.All(x =>
         {
             var param = this.GetGriddlyParameter(x.Key);