Validation changes, moved JS for Client-Side validation to Settings/Index.aspx

Still need to sort out validation for Quality Cutoff (not part of the Model so it seems to cause issues).

NzbDrone.Core/Repository/Quality/QualityProfile.cs

@@ -11,6 +11,7 @@ namespace NzbDrone.Core.Repository.Quality
         [SubSonicPrimaryKey(true)]
         public int ProfileId { get; set; }
 
+        [Required (ErrorMessage = "A Name is Required")]
         [DisplayName("Name")]
         public string Name { get; set; }
         public bool UserProfile { get; set; } //Allows us to tell the difference between default and user profiles

NzbDrone.Web/Controllers/SettingsController.cs

@@ -304,36 +304,38 @@ namespace NzbDrone.Web.Controllers
         {
             try
             {
-                _configProvider.SetValue("DefaultQualityProfile", data.DefaultProfileId.ToString());
+                if (ModelState.IsValid)
-
-                foreach (var dbProfile in _qualityProvider.GetAllProfiles().Where(q => q.UserProfile))
-                {
-                    if (!data.UserProfiles.Exists(p => p.ProfileId == dbProfile.ProfileId))
-                        _qualityProvider.Delete(dbProfile.ProfileId);
-                }
-
-
-                foreach (var profile in data.UserProfiles)
                 {
-                    Logger.Debug(String.Format("Updating User Profile: {0}", profile));
+                    _configProvider.SetValue("DefaultQualityProfile", data.DefaultProfileId.ToString());
 
-                    profile.Allowed = new List<QualityTypes>();
+                    foreach (var dbProfile in _qualityProvider.GetAllProfiles().Where(q => q.UserProfile))
-                    foreach (var quality in profile.AllowedString.Split(','))
                     {
-                        var qType = (QualityTypes)Enum.Parse(typeof(QualityTypes), quality);
+                        if (!data.UserProfiles.Exists(p => p.ProfileId == dbProfile.ProfileId))
-                        profile.Allowed.Add(qType);
+                            _qualityProvider.Delete(dbProfile.ProfileId);
                     }
 
-                    //If the Cutoff value selected is not in the allowed list then use the last allowed value, this should be validated on submit
+                    foreach (var profile in data.UserProfiles)
-                    if (!profile.Allowed.Contains(profile.Cutoff))
+                    {
-                        throw new InvalidOperationException("Invalid Cutoff Value");
+                        Logger.Debug(String.Format("Updating User Profile: {0}", profile));
-                    //profile.Cutoff = profile.Allowed.Last();
+
+                        profile.Allowed = new List<QualityTypes>();
+                        foreach (var quality in profile.AllowedString.Split(','))
+                        {
+                            var qType = (QualityTypes) Enum.Parse(typeof (QualityTypes), quality);
+                            profile.Allowed.Add(qType);
+                        }
 
-                    if (profile.ProfileId > 0)
+                        //If the Cutoff value selected is not in the allowed list then use the last allowed value, this should be validated on submit
-                        _qualityProvider.Update(profile);
+                        if (!profile.Allowed.Contains(profile.Cutoff))
+                            throw new InvalidOperationException("Invalid Cutoff Value");
+                        //profile.Cutoff = profile.Allowed.Last();
 
-                    else
+                        if (profile.ProfileId > 0)
-                        _qualityProvider.Add(profile);
+                            _qualityProvider.Update(profile);
+
+                        else
+                            _qualityProvider.Add(profile);
+                    }
                 }
             }
 

NzbDrone.Web/Models/QualityModel.cs

@@ -13,7 +13,6 @@ namespace NzbDrone.Web.Models
     {
         public List<QualityProfile> Profiles { get; set; }
         public List<QualityProfile> UserProfiles { get; set; }
-        //public List<QualityTypes> Qualities { get; set; }
 
         [DisplayName("Default Quality Profile")]
         public int DefaultProfileId { get; set; }

NzbDrone.Web/Views/Settings/Downloads.ascx

@@ -23,8 +23,6 @@
     }                
     </script>
 
-    <script src="/Scripts/MicrosoftAjax.js" type="text/javascript"></script>
-    <script src="/Scripts/MicrosoftMvcValidation.js" type="text/javascript"></script>
     <% Html.EnableClientValidation(); %>
 
 <% using (Html.BeginForm("SaveDownloads", "Settings", FormMethod.Post, new { id = "form", name = "form" }))

NzbDrone.Web/Views/Settings/Quality.ascx

@@ -26,11 +26,13 @@
 
     </script>
 
+    <% Html.EnableClientValidation(); %>
+
     <% using (Html.BeginForm("SaveQuality", "Settings", FormMethod.Post, new { id = "form", name = "form" }))
        {%>
         <fieldset>
             <legend>Quality</legend> 
-                <%: Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.") %>
+                <%--<%: Html.ValidationSummary(true, "Unable to save your settings. Please correct the errors and try again.") %>--%>
 
                 <div class="rightSide" style="float: right; width: 65%;">
                     <div id="defaultQualityDiv" style="float: left; margin: 30px;">