From 3a065b86f1249586ee7c0a772bbaff8d8d497e3d Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 21 Jun 2011 23:39:45 -0700 Subject: [PATCH] Fixed series grid after save so it has proper counts. --- NzbDrone.Core/Providers/SeriesProvider.cs | 4 ++-- NzbDrone.Web/Controllers/SeriesController.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NzbDrone.Core/Providers/SeriesProvider.cs b/NzbDrone.Core/Providers/SeriesProvider.cs index 896f09a02..db097889c 100644 --- a/NzbDrone.Core/Providers/SeriesProvider.cs +++ b/NzbDrone.Core/Providers/SeriesProvider.cs @@ -42,11 +42,11 @@ namespace NzbDrone.Core.Providers return series; } - public virtual IList GetAllSeriesWithEpisodeCount(bool ignoreSpecials) + public virtual IList GetAllSeriesWithEpisodeCount(bool ignoreSpecialsInSeasonCount) { var seasonNumber = 0; - if (!ignoreSpecials) + if (!ignoreSpecialsInSeasonCount) seasonNumber = -1; var series = _database.Fetch(@"SELECT Series.*, COUNT (NULLIF(Ignored, 1)) AS EpisodeCount, diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index ed892ca8f..f4d85145f 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -80,7 +80,7 @@ namespace NzbDrone.Web.Controllers [GridAction] public ActionResult _AjaxSeriesGrid() { - var series = GetSeriesModels(_seriesProvider.GetAllSeriesWithEpisodeCount(true).ToList()); + var series = GetSeriesModels(_seriesProvider.GetAllSeriesWithEpisodeCount(true)); return View(new GridModel(series)); } @@ -96,7 +96,7 @@ namespace NzbDrone.Web.Controllers _seriesProvider.UpdateSeries(oldSeries); - var series = GetSeriesModels(_seriesProvider.GetAllSeries().ToList()); + var series = GetSeriesModels(_seriesProvider.GetAllSeriesWithEpisodeCount(true)); return View(new GridModel(series)); } @@ -192,7 +192,7 @@ namespace NzbDrone.Web.Controllers return RedirectToAction("Details", new { seriesId }); } - private List GetSeriesModels(List seriesInDb) + private List GetSeriesModels(IList seriesInDb) { var series = seriesInDb.Select(s => new SeriesModel {