Consider null string in filters

AthosXtreme · AthosXtreme · commit 7ae926a49fbc · 2013-05-07T13:58:26.000-04:00
diff --git a/Mvc.JQuery.Datatables/TypeFilters.cs b/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("\"", "\"\"") + "\"))";
             }
         }
-
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -81,13 +81,12 @@ public static string StringFilter(string q, string columnname, Type columntype,`
`81`	`81`	`{`
`82`	`82`	`if (q.StartsWith("^"))`
`83`	`83`	`{`
`84`		`- return columnname + ".ToLower().StartsWith(\"" + q.ToLower().Replace("\"", "\"\"") + "\")";`
	`84`	`+ return "(!string.IsNullOrEmpty(" + columnname + ") && " + columnname + ".ToLower().StartsWith(\"" + q.ToLower().Replace("\"", "\"\"") + "\"))";`
`85`	`85`	`}`
`86`	`86`	`else`
`87`	`87`	`{`
`88`		`- return columnname + ".ToLower().Contains(\"" + q.ToLower().Replace("\"", "\"\"") + "\")";`
	`88`	`+ return "(!string.IsNullOrEmpty(" + columnname + ") && " + columnname + ".ToLower().Contains(\"" + q.ToLower().Replace("\"", "\"\"") + "\"))";`
`89`	`89`	`}`
`90`	`90`	`}`
`91`		`-`
`92`	`91`	`}`
`93`	`92`	`}`