github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'markus101'

Browse source 
Conflicts:
	NzbDrone.Web/NzbDrone.Web.csproj
This commit is contained in:
kay.one 2011-07-01 14:01:51 -07:00
commit c7a219ddc6
14 changed files with 441 additions and 551 deletions
Download patch file Download diff file Expand all files Collapse all files

22
NzbDrone.Web/Controllers/SettingsController.cs
View file

@ -56,22 +56,14 @@ namespace NzbDrone.Web.Controllers
return View();
}
public ActionResult Index(string viewName)
public ActionResult Index()
{
if (viewName != null)
ViewData["viewName"] = viewName;
else
return RedirectToAction("Indexers");
return View("Index");
return RedirectToAction("Indexers");
}
public ActionResult Indexers()
{
ViewData["viewName"] = "Indexers";
return View("Index", new IndexerSettingsModel
return View(new IndexerSettingsModel
{
NzbMatrixUsername = _configProvider.NzbMatrixUsername,
NzbMatrixApiKey = _configProvider.NzbMatrixApiKey,
@ -146,8 +138,6 @@ namespace NzbDrone.Web.Controllers
public ActionResult Notifications()
{
ViewData["viewName"] = "Notifications";
var model = new NotificationSettingsModel
{
XbmcEnabled = Convert.ToBoolean(_configProvider.GetValue("XbmcEnabled", false)),
@ -166,13 +156,11 @@ namespace NzbDrone.Web.Controllers
XbmcPassword = _configProvider.GetValue("XbmcPassword", String.Empty)
};
return View("Index", model);
return View(model);
}
public ActionResult EpisodeSorting()
{
ViewData["viewName"] = "EpisodeSorting";
var model = new EpisodeSortingModel();
model.SeriesName = _configProvider.SeriesName;
@ -189,7 +177,7 @@ namespace NzbDrone.Web.Controllers
model.NumberStyles = new SelectList(EpisodeSortingHelper.GetNumberStyles(), "Id", "Name");
model.MultiEpisodeStyles = new SelectList(EpisodeSortingHelper.GetMultiEpisodeStyles(), "Id", "Name");
return View("Index", model);
return View(model);
}
public ViewResult AddProfile()