diff --git a/NzbDrone.Web/Controllers/MisnamedController.cs b/NzbDrone.Web/Controllers/MisnamedController.cs deleted file mode 100644 index 9add4493a..000000000 --- a/NzbDrone.Web/Controllers/MisnamedController.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; -using NzbDrone.Core.Providers; -using NzbDrone.Web.Models; -using Telerik.Web.Mvc; - -namespace NzbDrone.Web.Controllers -{ - public class MisnamedController : Controller - { - private readonly MisnamedProvider _misnamedProvider; - - public MisnamedController(MisnamedProvider misnamedProvider) - { - _misnamedProvider = misnamedProvider; - } - - public ActionResult Index() - { - return View(); - } - - [GridAction(EnableCustomBinding = true)] - public ActionResult _AjaxBinding(GridCommand gridCommand) - { - var totalItems = 0; - - var misnamed = _misnamedProvider.MisnamedFiles(gridCommand.Page, gridCommand.PageSize, out totalItems); - - return View(new GridModel{ Data = misnamed, Total = totalItems }); - } - } -} diff --git a/NzbDrone.Web/Controllers/MissingController.cs b/NzbDrone.Web/Controllers/MissingController.cs index 5bb3a4037..8b4565ce3 100644 --- a/NzbDrone.Web/Controllers/MissingController.cs +++ b/NzbDrone.Web/Controllers/MissingController.cs @@ -40,25 +40,5 @@ namespace NzbDrone.Web.Controllers return View((object)serialized); } - - [GridAction] - public ActionResult _AjaxBinding() - { - var missingEpisodes = _episodeProvider.EpisodesWithoutFiles(false); - - var missing = missingEpisodes.Select(e => new MissingEpisodeModel - { - EpisodeId = e.EpisodeId, - SeriesId = e.SeriesId, - EpisodeNumbering = string.Format("{0}x{1:00}", e.SeasonNumber, e.EpisodeNumber), - EpisodeTitle = e.Title, - Overview = e.Overview, - SeriesTitle = e.Series.Title, - AirDate = e.AirDate.Value.ToString(), - AirDateString = e.AirDate.Value.ToBestDateString() - }); - - return View(new GridModel(missing)); - } } } diff --git a/NzbDrone.Web/Controllers/SystemController.cs b/NzbDrone.Web/Controllers/SystemController.cs index 40343b88b..abdbf3518 100644 --- a/NzbDrone.Web/Controllers/SystemController.cs +++ b/NzbDrone.Web/Controllers/SystemController.cs @@ -109,12 +109,7 @@ namespace NzbDrone.Web.Controllers public ActionResult PendingProcessing() { ViewData["DropDir"] = _configProvider.SabDropDirectory; - return View(); - } - [GridAction] - public ActionResult _PendingProcessingAjaxBinding() - { var dropDir = _configProvider.SabDropDirectory; var subFolders = _diskProvider.GetDirectories(dropDir); @@ -125,7 +120,7 @@ namespace NzbDrone.Web.Controllers { var model = new PendingProcessingModel(); model.Name = new DirectoryInfo(folder).Name; - model.Created = _diskProvider.DirectoryDateCreated(folder); + model.Created = _diskProvider.DirectoryDateCreated(folder).ToString(); model.Path = folder.Replace(Path.DirectorySeparatorChar, '|').Replace(Path.VolumeSeparatorChar, '^').Replace('\'', '`'); var files = _diskProvider.GetFileInfos(folder, "*.*", SearchOption.AllDirectories); @@ -143,7 +138,9 @@ namespace NzbDrone.Web.Controllers models.Add(model); } - return View(new GridModel(models)); + var serialized = new JavaScriptSerializer().Serialize(models); + + return View((object)serialized); } public JsonResult RenamePendingProcessing(string path) diff --git a/NzbDrone.Web/Models/PendingProcessingModel.cs b/NzbDrone.Web/Models/PendingProcessingModel.cs index ff0626da8..ab086852a 100644 --- a/NzbDrone.Web/Models/PendingProcessingModel.cs +++ b/NzbDrone.Web/Models/PendingProcessingModel.cs @@ -8,7 +8,9 @@ namespace NzbDrone.Web.Models { public string Name { get; set; } public string Files { get; set; } - public DateTime Created { get; set; } + public string Created { get; set; } public string Path { get; set; } + public string Actions { get; set; } + public string Details { get; set; } } } \ No newline at end of file diff --git a/NzbDrone.Web/Views/Misnamed/Index.cshtml b/NzbDrone.Web/Views/Misnamed/Index.cshtml deleted file mode 100644 index 8074627a3..000000000 --- a/NzbDrone.Web/Views/Misnamed/Index.cshtml +++ /dev/null @@ -1,93 +0,0 @@ -@using NzbDrone.Common -@using NzbDrone.Core.Model -@{ViewBag.Title = "Misnamed";} -@section ActionMenu{ -
-} - -