mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed up per comments

This commit is contained in:
Mark McDowall 2013-06-13 08:21:38 -07:00
parent c0d77fcca2
commit 8b8ee912c0
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Api/Notifications/NotificationModule.cs
View File

@ -34,7 +34,7 @@ namespace NzbDrone.Api.Notifications
var notificationResource = new NotificationResource(); var notificationResource = new NotificationResource();
notificationResource.InjectFrom(notification); notificationResource.InjectFrom(notification);
notificationResource.Fields = SchemaBuilder.GenerateSchema(notification.Settings); notificationResource.Fields = SchemaBuilder.GenerateSchema(notification.Settings);
notificationResource.Command = String.Format("test{0}", notification.Implementation.ToLowerInvariant()); notificationResource.TestCommand = String.Format("test{0}", notification.Implementation.ToLowerInvariant());
result.Add(notificationResource); result.Add(notificationResource);
} }

2
NzbDrone.Api/Notifications/NotificationResource.cs
View File

@ -13,6 +13,6 @@ namespace NzbDrone.Api.Notifications
public Boolean OnDownload { get; set; } public Boolean OnDownload { get; set; }
public List<Field> Fields { get; set; } public List<Field> Fields { get; set; }
public String Implementation { get; set; } public String Implementation { get; set; }
public String Command { get; set; } public String TestCommand { get; set; }
} }
} }

2
NzbDrone.Api/Notifications/NotificationSchemaModule.cs
View File

@ -31,7 +31,7 @@ namespace NzbDrone.Api.Notifications
var notificationResource = new NotificationResource(); var notificationResource = new NotificationResource();
notificationResource.InjectFrom(notification); notificationResource.InjectFrom(notification);
notificationResource.Fields = SchemaBuilder.GenerateSchema(notification.Settings); notificationResource.Fields = SchemaBuilder.GenerateSchema(notification.Settings);
notificationResource.Command = String.Format("test{0}", notification.Implementation.ToLowerInvariant()); notificationResource.TestCommand = String.Format("test{0}", notification.Implementation.ToLowerInvariant());
result.Add(notificationResource); result.Add(notificationResource);
} }

2
UI/Commands/CommandController.js
View File

@ -4,7 +4,7 @@ define(['app'], function () {
NzbDrone.Commands.Execute = function (name, properties) { NzbDrone.Commands.Execute = function (name, properties) {
var data = { command: name }; var data = { command: name };
if (properties !== undefined) { if (!properties) {
$.extend(data, properties); $.extend(data, properties);
} }

8
UI/Settings/Notifications/EditView.js
View File

@ -49,8 +49,8 @@ define([
}, },
_test: function () { _test: function () {
var command = this.model.get('command'); var testCommand = this.model.get('testCommand');
if (command) { if (testCommand) {
this.idle = false; this.idle = false;
this.ui.testButton.addClass('disabled'); this.ui.testButton.addClass('disabled');
this.ui.testIcon.removeClass('icon-question'); this.ui.testIcon.removeClass('icon-question');
@ -58,12 +58,12 @@ define([
var properties = {}; var properties = {};
_.each(this.model.attributes.fields, function (field) { _.each(this.model.get('fields'), function (field) {
properties[field.name] = field.value; properties[field.name] = field.value;
}); });
var self = this; var self = this;
var commandPromise = NzbDrone.Commands.Execute(command, properties); var commandPromise = NzbDrone.Commands.Execute(testCommand, properties);
commandPromise.done(function () { commandPromise.done(function () {
NzbDrone.Shared.Messenger.show({ NzbDrone.Shared.Messenger.show({
message: 'Notification settings tested successfully' message: 'Notification settings tested successfully'