Skip to content

Commit c3ab6bd

Browse files
committed
SearchCols fixes
1 parent dbac894 commit c3ab6bd

File tree

5 files changed

+10
-11
lines changed

5 files changed

+10
-11
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Mvc.JQuery.Datatables/Content/jquery-datatables-column-filter"]
2+
path = Mvc.JQuery.Datatables/Content/jquery-datatables-column-filter
3+
url = https://github.com/mcintyre321/jquery-datatables-column-filter.git

Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
}"));
2626
vm.ColumnFilter = true;
2727
vm
28-
.FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }).Select("Engineer", "Tester", "Manager")
28+
.FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }, new { sSearch = "Tester" }).Select("Engineer", "Tester", "Manager")
2929
.FilterOn("Id").NumberRange()
3030
.FilterOn("Salary", new { sSelector = "#custom-filter-placeholder-salary" }).NumberRange();
3131
//.FilterOn("Number").CheckBoxes(Enum.GetNames(typeof(Numbers)));

Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
options["fnServerData"] = new JRaw(" function(sSource, aoData, fnCallback) { $.ajax({ 'dataType': 'json', 'type': 'POST', 'url': sSource, 'data': aoData, 'success': fnCallback })}");
6868
options["aoColumnDefs"] = new JRaw(Model.ColumnDefsString);
69-
options["aoSearchCols"] = new JRaw(Model.ColumnInitialSearchString);
69+
options["aoSearchCols"] = Model.SearchCols;
7070
if (Model.JsOptions.Any())
7171
{
7272
foreach (var jsOption in Model.JsOptions)

Mvc.JQuery.Datatables/DataTableConfigVm.cs

+4-9
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,13 @@ public string ColumnDefsString
6161

6262
public bool AutoWidth { get; set; }
6363

64-
public string ColumnInitialSearchString
64+
public JToken SearchCols
6565
{
6666
get
6767
{
68-
return ConvertColumnDefsInitialSearchToJson(Columns);
68+
var initialSearches = Columns
69+
.Select(c => c.Searchable & c.SearchCols != null ? c.SearchCols : null as object).ToArray();
70+
return new JArray(initialSearches);
6971
}
7072
}
7173

@@ -256,13 +258,6 @@ private static string ConvertColumnDefsToJson(IEnumerable<ColDef> columns)
256258
return "[]";
257259
}
258260

259-
private static string ConvertColumnDefsInitialSearchToJson(IEnumerable<ColDef> columns)
260-
{
261-
var initialSearches = columns
262-
.Select(c => c.Searchable & c.SearchCols != null ? c.SearchCols.ToString() : null as object).ToArray();
263-
return new JArray(initialSearches).ToString();
264-
}
265-
266261
private static string ConvertColumnSortingToJson(IEnumerable<ColDef> columns)
267262
{
268263
var sortList = columns.Select((c, idx) => c.SortDirection == SortDirection.None ? new dynamic[] { -1, "" } : (c.SortDirection == SortDirection.Ascending ? new dynamic[] { idx, "asc" } : new dynamic[] { idx, "desc" })).Where(x => x[0] > -1).ToArray();

0 commit comments

Comments
 (0)