github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'markus101'

Browse source 
Conflicts:
	NzbDrone.Web/NzbDrone.Web.csproj
	NzbDrone.Web/Views/Log/Index.cshtml
This commit is contained in:
kay.one 2011-04-21 21:03:59 -07:00
commit 6f73260ab7
32 changed files with 1359 additions and 537 deletions
Download patch file Download diff file Expand all files Collapse all files

9
NzbDrone.Web/Controllers/HistoryController.cs
View file

@ -38,7 +38,10 @@ namespace NzbDrone.Web.Controllers
[GridAction]
public ActionResult _AjaxBinding()
{
var history = _historyProvider.AllItems().Select(h => new HistoryModel
//TODO: possible subsonic bug, IQuarible causes some issues so ToList() is called
var history = _historyProvider.AllItems().ToList().Select(h => new HistoryModel
{
HistoryId = h.HistoryId,
SeasonNumber = h.Episode.SeasonNumber,
@ -47,11 +50,13 @@ namespace NzbDrone.Web.Controllers
EpisodeOverview = h.Episode.Overview,
SeriesTitle = h.Episode.Series.Title,
NzbTitle = h.NzbTitle,
Quality = h.Quality.ToString("G"),
Quality = h.Quality.ToString(),
IsProper = h.IsProper,
Date = h.Date
});
history.ToList();
return View(new GridModel(history));
}
}