Merge with Kayone's branch.

This commit is contained in:
Mark McDowall 2011-05-17 22:32:23 -07:00
parent 8aad53f291
commit 7e44ee5020
8 changed files with 102 additions and 63 deletions

View file

@ -76,7 +76,7 @@ namespace NzbDrone.Web.Controllers
SeasonNumber = s.SeasonNumber,
SeasonString = GetSeasonString(s.SeasonNumber),
Monitored = s.Monitored
}).OrderBy(s=> s.SeasonNumber).ToList();
}).OrderBy(s => s.SeasonNumber).ToList();
return View(model);
}
@ -120,7 +120,7 @@ namespace NzbDrone.Web.Controllers
//Start removing this series
_jobProvider.QueueJob(typeof(DeleteSeriesJob), id);
var series = GetSeriesModels(seriesInDb);
return View(new GridModel(series));
}
@ -265,8 +265,7 @@ namespace NzbDrone.Web.Controllers
public ActionResult SyncEpisodesOnDisk(int seriesId)
{
//Syncs the episodes on disk for the specified series
var series = _seriesProvider.GetSeries(seriesId);
_mediaFileProvider.Scan(series);
_jobProvider.QueueJob(typeof(MediaFileScanJob), seriesId);
return RedirectToAction("Details", new { seriesId });
}