diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index a1f637f2c..8691827ad 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -170,19 +170,30 @@ namespace NzbDrone.Web.Controllers masterBacklogList.Insert(0, new KeyValuePair(-10, "Select...")); ViewData["MasterBacklogSettingSelectList"] = new SelectList(masterBacklogList, "Key", "Value"); - var series = _seriesProvider.GetAllSeries().OrderBy(o => SortHelper.SkipArticles(o.Title)); + var series = GetSeriesModels(_seriesProvider.GetAllSeries()).OrderBy(o => SortHelper.SkipArticles(o.Title)); return View(series); } [HttpPost] - public JsonResult Editor(List series) + public JsonResult Editor(List series) { //Save edits if (series == null || series.Count == 0) return JsonNotificationResult.Oops("Invalid post data"); - _seriesProvider.UpdateFromSeriesEditor(series); + _seriesProvider.UpdateFromSeriesEditor(series.Select(s => new Series + { + SeriesId = s.SeriesId, + QualityProfileId = s.QualityProfileId, + Monitored = s.Monitored, + SeasonFolder = s.SeasonFolder, + BacklogSetting = (BacklogSettingType)s.BacklogSetting, + Path = s.Path, + DownloadEpisodesAiredAfter = String.IsNullOrWhiteSpace(s.DownloadEpisodesAiredAfter) ? (DateTime?)null + : DateTime.Parse(s.DownloadEpisodesAiredAfter, null, DateTimeStyles.RoundtripKind) + } + ).ToList()); return JsonNotificationResult.Info("Series Mass Edit Saved"); } diff --git a/NzbDrone.Web/Views/Series/Editor.cshtml b/NzbDrone.Web/Views/Series/Editor.cshtml index 93ec6bbba..499a082a6 100644 --- a/NzbDrone.Web/Views/Series/Editor.cshtml +++ b/NzbDrone.Web/Views/Series/Editor.cshtml @@ -1,5 +1,5 @@ @using NzbDrone.Web.Helpers -@model IEnumerable +@model IEnumerable @{ViewBag.Title = "Series Editor";} @section HeaderContent diff --git a/NzbDrone.Web/Views/Series/EditorItem.cshtml b/NzbDrone.Web/Views/Series/EditorItem.cshtml index 6efda18b8..a34dc8ea6 100644 --- a/NzbDrone.Web/Views/Series/EditorItem.cshtml +++ b/NzbDrone.Web/Views/Series/EditorItem.cshtml @@ -1,4 +1,4 @@ -@model NzbDrone.Core.Repository.Series +@model NzbDrone.Web.Models.SeriesModel @using NzbDrone.Core.Model @using NzbDrone.Core.Repository.Quality @using NzbDrone.Web.Helpers