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/Views/Series/Index.cshtml
This commit is contained in:
kay.one 2011-06-29 23:19:44 -07:00
commit 4253d0b4cb
15 changed files with 358 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,8 +94,6 @@ namespace NzbDrone.Web.Controllers
public ActionResult Sabnzbd()
{
ViewData["viewName"] = "Sabnzbd";
var sabDropDir = _configProvider.SabDropDirectory;
var selectList = new SelectList(new List<string> {sabDropDir}, sabDropDir);
@ -112,13 +110,11 @@ namespace NzbDrone.Web.Controllers
SabDropDirectorySelectList = selectList
};
return View("Index", model);
return View(model);
}
public ActionResult Quality()
{
ViewData["viewName"] = "Quality";
var qualityTypes = new List<QualityTypes>();
foreach (QualityTypes qual in Enum.GetValues(typeof(QualityTypes)))
@ -139,7 +135,7 @@ namespace NzbDrone.Web.Controllers
QualityProfileSelectList = qualityProfileSelectList
};
return View("Index", model);
return View(model);
}
public ActionResult Notifications()