Merge pull request mcintyre321#36 from AthosXtreme/master

Some code fixes

Author: mcintyre321

Mvc.JQuery.Datatables/DataTablesResult.cs

@@ -58,6 +58,7 @@ public class DataTablesResult<T, TRes> : DataTablesResult<TRes>
             Guard<IEnumerable<bool>>(s => s.ToArray()),
             Guard<IEnumerable<double>>(s => s.ToArray()),
             Guard<IEnumerable<object>>(s => s.Select(o => GetTransformedValue(o.GetType(), o)).ToArray()),
+            Guard<bool>(s => s),
             Guard<object>(o => (o ?? "").ToString())
         };
 

Mvc.JQuery.Datatables/TypeExtensions.cs

@@ -4,29 +4,32 @@
 using System.Linq;
 using System.Reflection;
 
-public static class TypeExtensions
+namespace Mvc.JQuery.Datatables
 {
-    public static IEnumerable<PropertyInfo> GetSortedProperties(this Type t)
+    public static class TypeExtensions
     {
-        return from pi in t.GetProperties()
-               let da = (DisplayAttribute)pi.GetCustomAttributes(typeof(DisplayAttribute), false).SingleOrDefault()
-               let order = ((da != null && da.Order != 0) ? da.Order : int.MaxValue)
-               orderby order
-               select pi;
-    }
+        public static IEnumerable<PropertyInfo> GetSortedProperties(this Type t)
+        {
+            return from pi in t.GetProperties()
+                   let da = (DisplayAttribute)pi.GetCustomAttributes(typeof(DisplayAttribute), false).SingleOrDefault()
+                   let order = ((da != null && da.GetOrder() != null && da.GetOrder() >= 0) ? da.Order : int.MaxValue)
+                   orderby order
+                   select pi;
+        }
 
-    public static IEnumerable<PropertyInfo> GetSortedProperties<T>()
-    {
-        return typeof(T).GetSortedProperties();
-    }
-    public static IEnumerable<PropertyInfo> GetProperties(this Type t)
-    {
-        return from pi in t.GetProperties()
-               select pi;
-    }
+        public static IEnumerable<PropertyInfo> GetSortedProperties<T>()
+        {
+            return typeof(T).GetSortedProperties();
+        }
+        public static IEnumerable<PropertyInfo> GetProperties(this Type t)
+        {
+            return from pi in t.GetProperties()
+                   select pi;
+        }
 
-    public static IEnumerable<PropertyInfo> GetProperties<T>()
-    {
-        return typeof(T).GetSortedProperties();
+        public static IEnumerable<PropertyInfo> GetProperties<T>()
+        {
+            return typeof(T).GetSortedProperties();
+        }
     }
 }

Mvc.JQuery.Datatables/TypeFilters.cs

@@ -81,13 +81,12 @@ public static string StringFilter(string q, string columnname, Type columntype,
         {
             if (q.StartsWith("^"))
             {
-                return columnname + ".ToLower().StartsWith(\"" + q.ToLower().Replace("\"", "\"\"") + "\")";
+                return "(!string.IsNullOrEmpty(" + columnname + ") && " + columnname + ".ToLower().StartsWith(\"" + q.ToLower().Replace("\"", "\"\"") + "\"))";
             }
             else
             {
-                return columnname + ".ToLower().Contains(\"" + q.ToLower().Replace("\"", "\"\"") + "\")";
+                return "(!string.IsNullOrEmpty(" + columnname + ") && " + columnname + ".ToLower().Contains(\"" + q.ToLower().Replace("\"", "\"\"") + "\"))";
             }
         }
-
     }
 }