Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added input validation to quality profiles

This commit is contained in:
kay.one 2013-08-25 20:50:13 -07:00
parent 6367d3d204
commit 147bb5476b
3 changed files with 85 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NzbDrone.Api/Qualities/QualityProfileModule.cs
View File

@ -1,20 +1,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using NzbDrone.Core.Datastore;
using NzbDrone.Core.Qualities; using NzbDrone.Core.Qualities;
using NzbDrone.Api.Mapping; using NzbDrone.Api.Mapping;
using System.Linq; using System.Linq;
using FluentValidation;
namespace NzbDrone.Api.Qualities namespace NzbDrone.Api.Qualities
{ {
public static class LazyLoadedExtensions
{
public static IEnumerable<int> GetForeignKeys(this IEnumerable<ModelBase> models)
{
return models.Select(c => c.Id).Distinct();
}
}
public class QualityProfileModule : NzbDroneRestModule<QualityProfileResource> public class QualityProfileModule : NzbDroneRestModule<QualityProfileResource>
{ {
private readonly QualityProfileService _qualityProfileService; private readonly QualityProfileService _qualityProfileService;
@ -24,6 +15,10 @@ namespace NzbDrone.Api.Qualities
{ {
_qualityProfileService = qualityProfileService; _qualityProfileService = qualityProfileService;
SharedValidator.RuleFor(c => c.Name).NotEmpty();
SharedValidator.RuleFor(c => c.Cutoff).NotNull();
SharedValidator.RuleFor(c => c.Allowed).NotEmpty();
GetResourceAll = GetAll; GetResourceAll = GetAll;
GetResourceById = GetById; GetResourceById = GetById;

8
UI/Settings/Quality/Profile/EditQualityProfileTemplate.html
View File

@ -20,7 +20,7 @@
<div class="control-group"> <div class="control-group">
<label class="control-label">Cutoff</label> <label class="control-label">Cutoff</label>
<div class="controls"> <div class="controls">
<select class="x-cutoff" name="cutoff.id"> <select class="x-cutoff" name="cutoff.id" validation-name="cutoff">
{{#each allowed}} {{#each allowed}}
<option value="{{id}}">{{name}}</option> <option value="{{id}}">{{name}}</option>
{{/each}} {{/each}}
@ -41,14 +41,18 @@
</select> </select>
</div> </div>
<div class="span3"> <div class="span3">
<div class="control-group">
<div class="controls">
<h3>Allowed</h3> <h3>Allowed</h3>
<select multiple="multiple" class="x-allowed-list"> <select multiple="multiple" class="x-allowed-list" validation-name="allowed">
{{#each allowed}} {{#each allowed}}
<option value="{{id}}">{{name}}</option> <option value="{{id}}">{{name}}</option>
{{/each}} {{/each}}
</select> </select>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
{{#if id}} {{#if id}}

11
UI/Settings/Quality/Profile/EditQualityProfileView.js
View File

@ -1,5 +1,11 @@
'use strict'; 'use strict';
define(['app', 'marionette', 'Mixins/AsModelBoundView'], function (App, Marionette, AsModelBoundView) { define(
[
'app',
'marionette',
'Mixins/AsModelBoundView',
'Mixins/AsValidatedView'
], function (App, Marionette, AsModelBoundView, AsValidatedView) {
var view = Marionette.ItemView.extend({ var view = Marionette.ItemView.extend({
template: 'Settings/Quality/Profile/EditQualityProfileTemplate', template: 'Settings/Quality/Profile/EditQualityProfileTemplate',
@ -69,6 +75,7 @@ define(['app', 'marionette', 'Mixins/AsModelBoundView'], function (App, Marionet
} }
}); });
AsValidatedView.call(view);
return AsModelBoundView.call(view); return AsModelBoundView.call(view);
}); });