github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 02:37:08 -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 11:48:22 -07:00
commit 7c05157f19
7 changed files with 293 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,6 +125,12 @@ namespace NzbDrone.Web.Controllers
ViewData["Qualities"] = qualityTypes;
var profiles = _qualityProvider.GetAllProfiles().ToList();
foreach (var qualityProfile in profiles)
{
qualityProfile.AllowedString = string.Join(",", qualityProfile.Allowed);
}
var defaultQualityQualityProfileId = Convert.ToInt32(_configProvider.DefaultQualityProfile);
var qualityProfileSelectList = new SelectList(profiles, "QualityProfileId", "Name");
@ -201,11 +207,12 @@ namespace NzbDrone.Web.Controllers
{
Name = "New Profile",
Allowed = new List<QualityTypes> { QualityTypes.Unknown },
Cutoff = QualityTypes.Unknown,
Cutoff = QualityTypes.Unknown
};
var id = _qualityProvider.Add(qualityProfile);
qualityProfile.QualityProfileId = id;
qualityProfile.AllowedString = "Unknown";
ViewData["ProfileId"] = id;