Fixes for issues in PRs

Author: mcintyre321

Mvc.JQuery.Datatables/DataTablesResult.cs

@@ -16,14 +16,8 @@ public abstract class DataTablesResult : ActionResult
         /// <typeparam name="TTransform"></typeparam>
         /// <param name="q">A queryable for the data. The properties of this can be marked up with [DataTablesAttribute] to control sorting/searchability/visibility</param>
         /// <param name="dataTableParam"></param>
-        /// <param name="transform">//a transform for custom column rendering e.g. to do a custom date row => new { CreatedDate = row.CreatedDate.ToString("dd MM yy") } </param>
         /// <returns></returns>
-        public static DataTablesResult<TSource> Create<TSource, TTransform>(IQueryable<TSource> q, DataTablesParam dataTableParam,
-            Func<TSource, TTransform> transform, ArrayOutputType? arrayOutput = null)
-        {
-            return Create(q, dataTableParam, transform, new ResponseOptions<TSource>() { ArrayOutputType = arrayOutput });
-        }
-
+     
         public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, DataTablesParam dataTableParam,
             ArrayOutputType? arrayOutput = null)
         {
@@ -67,6 +61,7 @@ public static DataTablesResult<TSource> Create<TSource>(IQueryable<TSource> q, D
 
         private static DataTablesData ApplyOutputRules<TSource>(DataTablesData sourceData, ResponseOptions<TSource> responseOptions)
         {
+            responseOptions = responseOptions ?? new ResponseOptions<TSource>() {ArrayOutputType = ArrayOutputType.BiDimensionalArray};
             DataTablesData outputData = sourceData;
 
             switch (responseOptions.ArrayOutputType)

Mvc.Jquery.DataTables.Tests/FilterTests.cs

@@ -33,7 +33,7 @@ public void Setup()
             dataTablesParam = new DataTablesParam();
             columns = DataTablesTypeInfo<SomeModel>.Properties.Select((p, i) =>
                 Tuple.Create(i, new DataTablesPropertyInfo(p.PropertyInfo, new DataTablesAttributeBase[]{}))).ToArray();
-            dataTablesParam.sSearchColumns = new List<string>(columns.Select(c => null as string));
+            dataTablesParam.sSearchValues = new List<string>(columns.Select(c => null as string));
             dataTablesParam.bSearchable = new List<bool>(columns.Select(c => true));
 
         }
@@ -58,7 +58,7 @@ public void SearchQueryTests(string searchString, Type colType, bool returnsResu
         {
             var col = columns.First(c => c.Item2.Type == colType).Item1;
 
-            dataTablesParam.sSearchColumns[col] = searchString;
+            dataTablesParam.sSearchValues[col] = searchString;
             var result = new DataTablesResult<SomeModel>(queryable, dataTablesParam);
 
             var data = result.Data;

Mvc.Jquery.DataTables.Tests/Fixtures/Linq.cs

@@ -87,7 +87,7 @@ public static IEnumerable TestCases
                 dataTablesParam = GetEmptyParam(propertyCount);
                 dataTablesParam.iSortingCols = 1;
                 dataTablesParam.iSortCol[0] = 2;
-                dataTablesParam.sSearchColumns[3] = "25~35";
+                dataTablesParam.sSearchValues[3] = "25~35";
                 dataTablesParam.iDisplayStart = 6;
                 yield return new TestCaseData(dataTablesParam)
                     .Returns(new int[] { 17, 21, 25, 77, 81 })
@@ -107,7 +107,7 @@ static DataTablesParam GetEmptyParam(int columns)
             returnVar.bSearchable.AddRange(Enumerable.Repeat(true, columns));
             returnVar.bSortable.AddRange(Enumerable.Repeat(true, columns));
             returnVar.iSortCol.AddRange(Enumerable.Repeat(0, columns));
-            returnVar.sSearchColumns.AddRange(Enumerable.Repeat("", columns));
+            returnVar.sSearchValues.AddRange(Enumerable.Repeat("", columns));
             returnVar.sSortDir.AddRange(Enumerable.Repeat<string>(null, columns));
 
             return returnVar;

Mvc.Jquery.DataTables.Tests/Fixtures/ModelBinding.cs

@@ -91,7 +91,7 @@ public void TestDataTablesIModelBinder()
             Assert.That(res.iSortingCols, Is.EqualTo(1), "iSortingCols");
             Assert.That(res.sEcho, Is.EqualTo(1), "sEcho");
             Assert.That(res.sSearch,Is.EqualTo(""),"sSearch");
-            Assert.That(res.sSearchColumns, Is.EqualTo(Enumerable.Repeat("", 9)), "sSearchColumns");
+            Assert.That(res.sSearchValues, Is.EqualTo(Enumerable.Repeat("", 9)), "sSearchColumns");
             Assert.That(res.sSortDir, Is.EqualTo(Enumerable.Repeat<string>(null, 9).ReplaceAtIndex("asc", 0)), "sSortDir");
             Assert.That(res.bEscapeRegex, Is.EqualTo(false), "bEscapeRegex");
         }