Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Log Grid will now allow sorting by multiple columns.

This commit is contained in:
Mark McDowall 2012-02-25 15:14:48 -08:00
parent b86a19451d
commit 5d81c6b7b1
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
NzbDrone.Web/Controllers/LogController.cs
View File

@ -64,11 +64,16 @@ namespace NzbDrone.Web.Controllers
int filteredCount = q.Count(); int filteredCount = q.Count();
int sortCol = dataTablesParams.iSortCol.First(); IQueryable<Log> sorted = q;
var sortColName = sortCol == 0 ? "Time" : sortCol == 1 ? "Level" : "Logger";
var sortExpression = String.Format("{0} {1}", sortColName, dataTablesParams.sSortDir.First());
var sorted = q.OrderBy(sortExpression); for (int i = 0; i < dataTablesParams.iSortingCols; i++)
{
int sortCol = dataTablesParams.iSortCol[i];
var sortColName = sortCol == 0 ? "Time" : sortCol == 1 ? "Level" : "Logger";
var sortExpression = String.Format("{0} {1}", sortColName, dataTablesParams.sSortDir[i]);
sorted = sorted.OrderBy(sortExpression);
}
IQueryable<Log> filteredAndSorted = sorted; IQueryable<Log> filteredAndSorted = sorted;
if (filteredCount > dataTablesParams.iDisplayLength) if (filteredCount > dataTablesParams.iDisplayLength)

2
NzbDrone.Web/Views/Log/Index.cshtml
View File

@ -63,7 +63,7 @@
"sPaginationType": "four_button", "sPaginationType": "four_button",
"aoColumns": [ "aoColumns": [
{ sWidth: '150px', "mDataProp": "Time" }, //Time { sWidth: '150px', "mDataProp": "Time" }, //Time
{sWidth: '50px', "mDataProp": "Level" }, //Level {sWidth: '60px', "mDataProp": "Level" }, //Level
{sWidth: '240px', "mDataProp": "Source" }, //Source {sWidth: '240px', "mDataProp": "Source" }, //Source
{sWidth: 'auto', "mDataProp": "Message", "bSortable": false }, //Message {sWidth: 'auto', "mDataProp": "Message", "bSortable": false }, //Message
{sWidth: 'auto', "mDataProp": "Details", "bSortable": false, "bVisible": false, "fnRender": function (row) { {sWidth: 'auto', "mDataProp": "Details", "bSortable": false, "bVisible": false, "fnRender": function (row) {