diff --git a/NzbDrone.Core/Providers/Jobs/BacklogSearchJob.cs b/NzbDrone.Core/Providers/Jobs/BacklogSearchJob.cs index d008a7172..aa53b9b5d 100644 --- a/NzbDrone.Core/Providers/Jobs/BacklogSearchJob.cs +++ b/NzbDrone.Core/Providers/Jobs/BacklogSearchJob.cs @@ -4,6 +4,7 @@ using System.Linq; using NLog; using NzbDrone.Core.Model; using NzbDrone.Core.Model.Notification; +using NzbDrone.Core.Model.Search; using NzbDrone.Core.Repository; namespace NzbDrone.Core.Providers.Jobs @@ -36,9 +37,9 @@ namespace NzbDrone.Core.Providers.Jobs public void Start(ProgressNotification notification, int targetId, int secondaryTargetId) { - var missingEpisodes = - _episodeProvider.EpisodesWithoutFiles(true).GroupBy(e => new { e.SeriesId, e.SeasonNumber }); - + var missingEpisodes = _episodeProvider.EpisodesWithoutFiles(true) + .GroupBy(e => new { e.SeriesId, e.SeasonNumber }); + var individualEpisodes = new List(); Logger.Trace("Processing missing episodes list"); diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index a1b7527b2..64d201ceb 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -68,6 +68,7 @@ namespace NzbDrone.Web.Controllers var history = _historyProvider.AllItemsWithRelationships().Select(h => new HistoryModel { HistoryId = h.HistoryId, + SeriesId = h.SeriesId, SeasonNumber = h.Episode.SeasonNumber, EpisodeNumber = h.Episode.EpisodeNumber, EpisodeTitle = h.Episode.Title, diff --git a/NzbDrone.Web/Controllers/MissingController.cs b/NzbDrone.Web/Controllers/MissingController.cs index 581c3f541..8ac0724c1 100644 --- a/NzbDrone.Web/Controllers/MissingController.cs +++ b/NzbDrone.Web/Controllers/MissingController.cs @@ -31,6 +31,7 @@ namespace NzbDrone.Web.Controllers var missing = missingEpisodes.Select(e => new MissingEpisodeModel { EpisodeId = e.EpisodeId, + SeriesId = e.SeriesId, SeasonNumber = e.SeasonNumber, EpisodeNumber = e.EpisodeNumber, EpisodeTitle = e.Title, diff --git a/NzbDrone.Web/Controllers/UpcomingController.cs b/NzbDrone.Web/Controllers/UpcomingController.cs index 5b463da2f..99e23bdb7 100644 --- a/NzbDrone.Web/Controllers/UpcomingController.cs +++ b/NzbDrone.Web/Controllers/UpcomingController.cs @@ -32,7 +32,7 @@ namespace NzbDrone.Web.Controllers { SeriesId = u.Series.SeriesId, EpisodeId = u.EpisodeId, - SeriesName = u.Series.Title, + SeriesTitle = u.Series.Title, SeasonNumber = u.SeasonNumber, EpisodeNumber = u.EpisodeNumber, Title = u.Title, @@ -50,7 +50,7 @@ namespace NzbDrone.Web.Controllers { SeriesId = u.Series.SeriesId, EpisodeId = u.EpisodeId, - SeriesName = u.Series.Title, + SeriesTitle = u.Series.Title, SeasonNumber = u.SeasonNumber, EpisodeNumber = u.EpisodeNumber, Title = u.Title, @@ -68,7 +68,7 @@ namespace NzbDrone.Web.Controllers { SeriesId = u.Series.SeriesId, EpisodeId = u.EpisodeId, - SeriesName = u.Series.Title, + SeriesTitle = u.Series.Title, SeasonNumber = u.SeasonNumber, EpisodeNumber = u.EpisodeNumber, Title = u.Title, @@ -86,7 +86,7 @@ namespace NzbDrone.Web.Controllers { SeriesId = u.Series.SeriesId, EpisodeId = u.EpisodeId, - SeriesName = u.Series.Title, + SeriesTitle = u.Series.Title, SeasonNumber = u.SeasonNumber, EpisodeNumber = u.EpisodeNumber, Title = u.Title, diff --git a/NzbDrone.Web/Models/HistoryModel.cs b/NzbDrone.Web/Models/HistoryModel.cs index f29a51f6f..1bb6cbd25 100644 --- a/NzbDrone.Web/Models/HistoryModel.cs +++ b/NzbDrone.Web/Models/HistoryModel.cs @@ -6,6 +6,7 @@ namespace NzbDrone.Web.Models public class HistoryModel { public int HistoryId { get; set; } + public int SeriesId { get; set; } public string SeriesTitle { get; set; } public int SeasonNumber { get; set; } public int EpisodeNumber { get; set; } diff --git a/NzbDrone.Web/Models/MissingEpisodeModel.cs b/NzbDrone.Web/Models/MissingEpisodeModel.cs index 468109456..492b440e5 100644 --- a/NzbDrone.Web/Models/MissingEpisodeModel.cs +++ b/NzbDrone.Web/Models/MissingEpisodeModel.cs @@ -7,6 +7,7 @@ namespace NzbDrone.Web.Models { public class MissingEpisodeModel { + public int SeriesId { get; set; } public int EpisodeId { get; set; } public string SeriesTitle { get; set; } public int SeasonNumber { get; set; } diff --git a/NzbDrone.Web/Models/UpcomingEpisodeModel.cs b/NzbDrone.Web/Models/UpcomingEpisodeModel.cs index 9fc69921d..a54325b94 100644 --- a/NzbDrone.Web/Models/UpcomingEpisodeModel.cs +++ b/NzbDrone.Web/Models/UpcomingEpisodeModel.cs @@ -6,7 +6,7 @@ namespace NzbDrone.Web.Models { public int SeriesId { get; set; } public int EpisodeId { get; set; } - public string SeriesName { get; set; } + public string SeriesTitle { get; set; } public int SeasonNumber { get; set; } public int EpisodeNumber { get; set; } public string Title { get; set; } diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml index 392bb0ce0..1f55d96ab 100644 --- a/NzbDrone.Web/Views/History/Index.cshtml +++ b/NzbDrone.Web/Views/History/Index.cshtml @@ -38,7 +38,11 @@ History .ClientTemplate("
<#= Indexer #>
") .Title("") .Width(20); - columns.Bound(c => c.SeriesTitle).Title("Series Name"); + columns.Bound(c => c.SeriesTitle) + .ClientTemplate("<#= SeriesTitle #>") + .Title("Series Title"); columns.Bound(c => c.SeasonNumber).Title("Season").Width(1); columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(1); columns.Bound(c => c.EpisodeTitle).Title("Episode Title"); diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml index c02f58421..4f0d4947d 100644 --- a/NzbDrone.Web/Views/Missing/Index.cshtml +++ b/NzbDrone.Web/Views/Missing/Index.cshtml @@ -5,20 +5,41 @@ Missing } + + @section MainContent{ @{Html.Telerik().Grid().Name("missing") .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { - columns.Bound(c => c.SeriesTitle).Title("Series Name"); + columns.Bound(c => c.SeriesTitle) + .ClientTemplate("<#= SeriesTitle #>") + .Title("Series Title"); columns.Bound(c => c.SeasonNumber).Title("Season").Width(40); columns.Bound(c => c.EpisodeNumber).Title("Episode").Width(40); columns.Bound(c => c.EpisodeTitle).Title("Episode Title"); columns.Bound(c => c.AirDate).Format("{0:d}") .Title("Air Date") .Width(80); - columns.Bound(o => o.EpisodeId).Title("") - .ClientTemplate("'); return false;\" >Search"); + columns.Bound(c => c.EpisodeId) + .Title("Actions") + .ClientTemplate("\" onClick=\"searchForEpisode('<#= EpisodeId #>'); return false;\">Search") + .Width("40"); }) .DetailView(detailView => detailView.ClientTemplate( "
" + diff --git a/NzbDrone.Web/Views/Series/Details.cshtml b/NzbDrone.Web/Views/Series/Details.cshtml index 86ea63e9b..257b16a7b 100644 --- a/NzbDrone.Web/Views/Series/Details.cshtml +++ b/NzbDrone.Web/Views/Series/Details.cshtml @@ -118,13 +118,6 @@ .TableHtmlAttributes(new { @class = "Grid" }) .Columns(columns => { - //columns.Bound(o => o.Ignored) - // .Title("") - // .ClientTemplate( - // "") - // .Width(20) - // .HtmlAttributes(new { style = "text-align:center" }); - columns.Bound(c => c.EpisodeNumber).Width(0).Title("Episode"); columns.Bound(c => c.Title).Title("Title"); columns.Bound(c => c.AirDate).Width(0); @@ -139,11 +132,6 @@ "\" onclick=\"searchForEpisode('<#= EpisodeId #>'); return false;\">Search" + "\" onclick=\"renameEpisode('<#= EpisodeFileId #>'); return false;\">Rename") .Width(80); - //columns.Bound(o => o.EpisodeId).Title("") - // .ClientTemplate("\" onclick=\"searchForEpisode('<#= EpisodeId #>'); return false;\">Search" - // + " | " + - // "\" onclick=\"renameEpisode('<#= EpisodeFileId #>'); return false;\">Rename" - // ); }) .DetailView(detailView => detailView.ClientTemplate("
<#= Overview #>
<#= Path #>
")) .Sortable(rows => rows.OrderBy(epSort => epSort.Add(c => c.EpisodeNumber).Descending()).Enabled(false)) diff --git a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml index 7780ca833..ed920f5af 100644 --- a/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml +++ b/NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml @@ -7,8 +7,15 @@ } @@ -74,6 +81,7 @@ @Html.DropDownListFor(m => m.MultiEpisodeStyle, Model.MultiEpisodeStyles, new { @class = "inputClass selectClass" }) +
@@ -90,6 +98,10 @@