From feaf63c758f81e03bb9ae10caed5fd93ba3aa8fe Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Wed, 5 Dec 2012 17:54:09 -0800 Subject: [PATCH] DateTime.ToString fixes for other countries Fixed: Aired Date sorting on Missing --- .../NzbDrone.Services.Service.csproj | 2 +- NzbDrone.Web/Controllers/HistoryController.cs | 3 ++- NzbDrone.Web/Controllers/MissingController.cs | 5 +++-- NzbDrone.Web/Controllers/SeriesController.cs | 2 +- NzbDrone.Web/Models/MissingEpisodeModel.cs | 2 +- NzbDrone.Web/Views/Missing/Index.cshtml | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj b/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj index 5e178474b..15eb7f6ee 100644 --- a/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj +++ b/NzbDrone.Services/NzbDrone.Services.Service/NzbDrone.Services.Service.csproj @@ -362,7 +362,7 @@ False True - 62182 + 32122 / http://localhost:62182/ False diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs index 8d203502c..fc92aa598 100644 --- a/NzbDrone.Web/Controllers/HistoryController.cs +++ b/NzbDrone.Web/Controllers/HistoryController.cs @@ -1,4 +1,5 @@ using System; +using System.Globalization; using System.Linq; using System.Linq.Dynamic; using System.Web.Mvc; @@ -45,7 +46,7 @@ public ActionResult AjaxBinding(DataTablesPageRequest pageRequest) Quality = h.Quality.ToString(), IsProper = h.IsProper, Date = h.Date.ToString(), - DateSorter = h.Date.ToString("MM/dd/yyyy h:mm:ss tt"), + DateSorter = h.Date.ToString("o", CultureInfo.InvariantCulture), Indexer = h.Indexer, EpisodeId = h.EpisodeId, NzbInfoUrl = h.NzbInfoUrl, diff --git a/NzbDrone.Web/Controllers/MissingController.cs b/NzbDrone.Web/Controllers/MissingController.cs index d1045c68d..c111dc82b 100644 --- a/NzbDrone.Web/Controllers/MissingController.cs +++ b/NzbDrone.Web/Controllers/MissingController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Web; using System.Web.Mvc; @@ -34,8 +35,8 @@ public ActionResult Index() Overview = e.Overview, SeriesTitle = e.Series.Title, SeriesTitleSorter = SortHelper.SkipArticles(e.Series.Title), - AirDate = e.AirDate.Value.ToString("MM/dd/yyyy"), - AirDateString = e.AirDate.Value.ToBestDateString() + AirDateSorter = e.AirDate.Value.ToString("o", CultureInfo.InvariantCulture), + AirDate = e.AirDate.Value.ToBestDateString() }); JsConfig.IncludeNullValues = true; diff --git a/NzbDrone.Web/Controllers/SeriesController.cs b/NzbDrone.Web/Controllers/SeriesController.cs index 7ae695143..2a3a299b7 100644 --- a/NzbDrone.Web/Controllers/SeriesController.cs +++ b/NzbDrone.Web/Controllers/SeriesController.cs @@ -225,7 +225,7 @@ private List GetSeriesModels(IList seriesInDb) EpisodeCount = s.EpisodeCount, EpisodeFileCount = s.EpisodeFileCount, NextAiring = s.NextAiring == null ? String.Empty : s.NextAiring.Value.ToBestDateString(), - NextAiringSorter = s.NextAiring == null ? "12/31/9999" : s.NextAiring.Value.ToString("MM/dd/yyyy"), + NextAiringSorter = s.NextAiring == null ? new DateTime(9999, 12, 31).ToString("o", CultureInfo.InvariantCulture) : s.NextAiring.Value.ToString("o", CultureInfo.InvariantCulture), AirTime = s.AirTimes, CustomStartDate = s.CustomStartDate.HasValue ? s.CustomStartDate.Value.ToString("yyyy-MM-dd") : String.Empty }).ToList(); diff --git a/NzbDrone.Web/Models/MissingEpisodeModel.cs b/NzbDrone.Web/Models/MissingEpisodeModel.cs index 7c54ecaaf..7db97a09c 100644 --- a/NzbDrone.Web/Models/MissingEpisodeModel.cs +++ b/NzbDrone.Web/Models/MissingEpisodeModel.cs @@ -12,8 +12,8 @@ public class MissingEpisodeModel public string SeriesTitleSorter { get; set; } public string EpisodeNumbering { get; set; } public string EpisodeTitle { get; set; } + public string AirDateSorter { get; set; } public string AirDate { get; set; } - public string AirDateString { get; set; } public string Overview { get; set; } public string Details { get; set; } } diff --git a/NzbDrone.Web/Views/Missing/Index.cshtml b/NzbDrone.Web/Views/Missing/Index.cshtml index 363e57f61..b1a087666 100644 --- a/NzbDrone.Web/Views/Missing/Index.cshtml +++ b/NzbDrone.Web/Views/Missing/Index.cshtml @@ -49,10 +49,10 @@ function airDate (source, type, val) { // 'display' and 'filter' use our fancy naming if (type === 'display' || type === 'filter') { - return source["AirDateString"]; + return source["AirDate"]; } // 'sort' and 'type' both just use the raw data - return source["AirDate"]; + return source["AirDateSorter"]; } function actions(row) {