Skip to content

Commit 4262f50

Browse files
mcintyre321mcintyre321
committed
Removed a ToArray that was interfering with query projection
1 parent 25c9b9b commit 4262f50

File tree

2 files changed

+5
-79
lines changed

2 files changed

+5
-79
lines changed

‎Mvc.JQuery.Datatables/DataTablesResult.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,10 @@ private DataTablesData GetResults(IQueryable<T> data, DataTablesParam param, Tup
9090

9191
int totalRecordsDisplay;
9292

93-
DataTablesFilter filters = new DataTablesFilter();
93+
var filters = new DataTablesFilter();
9494

9595

96-
var dataArray = data.Cast<T>().ToArray().AsQueryable().Select(_transform).Cast<TRes>().AsQueryable();
96+
var dataArray = data.Cast<T>().Select(_transform).AsQueryable();
9797
dataArray = filters.FilterPagingSortingSearch(param, dataArray, out totalRecordsDisplay, searchColumns).Cast<TRes>();
9898

9999
var type = typeof(TRes);

‎Mvc.JQuery.Datatables/Mvc.JQuery.Datatables.csproj‎

Lines changed: 3 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@
6565
<Link>Views\Shared\DataTable.cshtml</Link>
6666
</EmbeddedResource>
6767
<None Include="App_Start\RegisterDatatablesModelBinder.cs.pp" />
68-
<None Include="Content\DataTables-1.9.1\extras\TableTools\media\images\psd\collection.psd" />
69-
<None Include="Content\DataTables-1.9.1\extras\TableTools\media\images\psd\copy document.psd" />
70-
<None Include="Content\DataTables-1.9.1\extras\TableTools\media\images\psd\file_types.psd" />
71-
<None Include="Content\DataTables-1.9.1\extras\TableTools\media\images\psd\printer.psd" />
72-
<None Include="Content\DataTables-1.9.1\media\images\Sorting icons.psd" />
7368
<None Include="packages.config">
7469
<SubType>Designer</SubType>
7570
</None>
@@ -81,84 +76,15 @@
8176
<None Include="Scripts\DataTables-1.9.1\extras\TableTools\media\js\TableTools.min.js.gz" />
8277
<None Include="Views\Web.config" />
8378
</ItemGroup>
84-
<ItemGroup />
79+
<ItemGroup>
80+
<Folder Include="Content\" />
81+
</ItemGroup>
8582
<ItemGroup>
8683
<EmbeddedResource Include="..\Mvc.JQuery.Datatables.Templates\Scripts\jquery.dataTables.columnFilter.js">
8784
<Link>Scripts\jquery.dataTables.columnFilter.js</Link>
8885
</EmbeddedResource>
8986
</ItemGroup>
9087
<ItemGroup>
91-
<Content Include="Content\DataTables-1.9.1\docs\media\css\doc.css" />
92-
<Content Include="Content\DataTables-1.9.1\docs\media\css\shCore.css" />
93-
<Content Include="Content\DataTables-1.9.1\docs\media\css\shThemeDataTables.css" />
94-
<Content Include="Content\DataTables-1.9.1\docs\media\images\arrow.jpg" />
95-
<Content Include="Content\DataTables-1.9.1\docs\media\images\extended.png" />
96-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\css\AutoFill.css" />
97-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\docs\media\css\doc.css" />
98-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\docs\media\css\shCore.css" />
99-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\docs\media\css\shThemeDataTables.css" />
100-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\docs\media\images\arrow.jpg" />
101-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\docs\media\images\extended.png" />
102-
<Content Include="Content\DataTables-1.9.1\extras\AutoFill\media\images\filler.png" />
103-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\css\ColReorder.css" />
104-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\docs\media\css\doc.css" />
105-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\docs\media\css\shCore.css" />
106-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\docs\media\css\shThemeDataTables.css" />
107-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\docs\media\images\arrow.jpg" />
108-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\docs\media\images\extended.png" />
109-
<Content Include="Content\DataTables-1.9.1\extras\ColReorder\media\images\insert.png" />
110-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\css\ColVis.css" />
111-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\css\ColVisAlt.css" />
112-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\docs\media\css\doc.css" />
113-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\docs\media\css\shCore.css" />
114-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\docs\media\css\shThemeDataTables.css" />
115-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\docs\media\images\arrow.jpg" />
116-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\docs\media\images\extended.png" />
117-
<Content Include="Content\DataTables-1.9.1\extras\ColVis\media\images\button.png" />
118-
<Content Include="Content\DataTables-1.9.1\extras\FixedColumns\docs\media\css\doc.css" />
119-
<Content Include="Content\DataTables-1.9.1\extras\FixedColumns\docs\media\css\shCore.css" />
120-
<Content Include="Content\DataTables-1.9.1\extras\FixedColumns\docs\media\css\shThemeDataTables.css" />
121-
<Content Include="Content\DataTables-1.9.1\extras\FixedColumns\docs\media\images\arrow.jpg" />
122-
<Content Include="Content\DataTables-1.9.1\extras\FixedColumns\docs\media\images\extended.png" />
123-
<Content Include="Content\DataTables-1.9.1\extras\Scroller\media\docs\media\css\doc.css" />
124-
<Content Include="Content\DataTables-1.9.1\extras\Scroller\media\docs\media\css\shCore.css" />
125-
<Content Include="Content\DataTables-1.9.1\extras\Scroller\media\docs\media\css\shThemeDataTables.css" />
126-
<Content Include="Content\DataTables-1.9.1\extras\Scroller\media\docs\media\images\arrow.jpg" />
127-
<Content Include="Content\DataTables-1.9.1\extras\Scroller\media\docs\media\images\extended.png" />
128-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\css\TableTools.css" />
129-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\css\TableTools_JUI.css" />
130-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\background.png" />
131-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\collection.png" />
132-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\collection_hover.png" />
133-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\copy.png" />
134-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\copy_hover.png" />
135-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\csv.png" />
136-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\csv_hover.png" />
137-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\pdf.png" />
138-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\pdf_hover.png" />
139-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\print.png" />
140-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\print_hover.png" />
141-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\xls.png" />
142-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\images\xls_hover.png" />
143-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\swf\copy_csv_xls.swf" />
144-
<Content Include="Content\DataTables-1.9.1\extras\TableTools\media\swf\copy_csv_xls_pdf.swf" />
145-
<Content Include="Content\DataTables-1.9.1\media\css\demo_page.css" />
146-
<Content Include="Content\DataTables-1.9.1\media\css\demo_table.css" />
147-
<Content Include="Content\DataTables-1.9.1\media\css\demo_table_jui.css" />
148-
<Content Include="Content\DataTables-1.9.1\media\css\jquery.dataTables.css" />
149-
<Content Include="Content\DataTables-1.9.1\media\css\jquery.dataTables_themeroller.css" />
150-
<Content Include="Content\DataTables-1.9.1\media\images\back_disabled.png" />
151-
<Content Include="Content\DataTables-1.9.1\media\images\back_enabled.png" />
152-
<Content Include="Content\DataTables-1.9.1\media\images\back_enabled_hover.png" />
153-
<Content Include="Content\DataTables-1.9.1\media\images\favicon.ico" />
154-
<Content Include="Content\DataTables-1.9.1\media\images\forward_disabled.png" />
155-
<Content Include="Content\DataTables-1.9.1\media\images\forward_enabled.png" />
156-
<Content Include="Content\DataTables-1.9.1\media\images\forward_enabled_hover.png" />
157-
<Content Include="Content\DataTables-1.9.1\media\images\sort_asc.png" />
158-
<Content Include="Content\DataTables-1.9.1\media\images\sort_asc_disabled.png" />
159-
<Content Include="Content\DataTables-1.9.1\media\images\sort_both.png" />
160-
<Content Include="Content\DataTables-1.9.1\media\images\sort_desc.png" />
161-
<Content Include="Content\DataTables-1.9.1\media\images\sort_desc_disabled.png" />
16288
<Content Include="Scripts\DataTables-1.9.1\docs\media\js\doc.js" />
16389
<Content Include="Scripts\DataTables-1.9.1\docs\media\js\jquery.js" />
16490
<Content Include="Scripts\DataTables-1.9.1\docs\media\js\shBrushJScript.js" />

0 commit comments

Comments
 (0)