Merge remote-tracking branch 'origin/master' into release-group

This commit is contained in:
Mark McDowall 2012-08-06 11:56:33 -07:00
commit 0d40e2d43e
3 changed files with 10 additions and 32 deletions

View file

@ -27,34 +27,6 @@ namespace NzbDrone.Web.Controllers
return View();
}
//public JsonResult AjaxBinding()
//{
// var history = _historyProvider.AllItemsWithRelationships().Select(h => new HistoryModel
// {
// HistoryId = h.HistoryId,
// SeriesId = h.SeriesId,
// EpisodeNumbering = string.Format("{0}x{1:00}", h.Episode.SeasonNumber, h.Episode.EpisodeNumber),
// EpisodeTitle = h.Episode.Title,
// EpisodeOverview = h.Episode.Overview,
// SeriesTitle = h.SeriesTitle,
// SeriesTitleSorter = SortHelper.SkipArticles(h.SeriesTitle),
// NzbTitle = h.NzbTitle,
// Quality = h.Quality.ToString(),
// IsProper = h.IsProper,
// Date = h.Date.ToString(),
// DateSorter = h.Date.ToString("MM/dd/yyyy h:mm:ss tt"),
// Indexer = h.Indexer,
// EpisodeId = h.EpisodeId,
// NzbInfoUrl = h.NzbInfoUrl
// }).OrderByDescending(h => h.Date).ToList();
// return Json(new
// {
// aaData = history
// },
// JsonRequestBehavior.AllowGet);
//}
public ActionResult AjaxBinding(DataTablesPageRequest pageRequest)
{
var pageResult = _historyProvider.GetPagedItems(pageRequest);