open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced save notifications for settings on page with AJAX Notifications.

Browse Source
pull/4/head
Mark McDowall 13 years ago
parent 3cc052e9b6
commit d65d79a5c9
10 changed files with 81 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
NzbDrone.Core/Providers/Jobs/JobProvider.cs
Unescape View File

@ -155,7 +155,7 @@ namespace NzbDrone.Core.Providers.Jobs
var timerClass = _jobs.Where(t => t.GetType() == jobType).FirstOrDefault();
if (timerClass == null)
{
Logger.Error("Unable to locate implantation for '{0}'. Make sure its properly registered.", jobType.ToString());
Logger.Error("Unable to locate implementation for '{0}'. Make sure its properly registered.", jobType.ToString());
return;
}

5
NzbDrone.Web/Content/style.css
Unescape View File

@ -278,6 +278,11 @@ button, input[type="button"], input[type="submit"], input[type="reset"]
border-bottom-color: #3C3C3C;
}
.hiddenResult
{
display: none;
}
/* Add Series */
.tvDbSearchResults

16
NzbDrone.Web/Controllers/NotificationController.cs
Unescape View File

@ -18,9 +18,21 @@ namespace NzbDrone.Web.Controllers
public JsonResult Index()
{
string message = string.Empty;
if (_notifications.GetProgressNotifications.Count != 0)
var basic = _notifications.BasicNotifications;
if (basic.Count != 0)
{
message = basic[0].Title;
if (basic[0].AutoDismiss)
_notifications.Dismiss(basic[0].Id);
}
else
{
message = _notifications.GetProgressNotifications[0].CurrentMessage;
if (_notifications.GetProgressNotifications.Count != 0)
message = _notifications.GetProgressNotifications[0].CurrentMessage;
}
return Json(message, JsonRequestBehavior.AllowGet);

56
NzbDrone.Web/Controllers/SettingsController.cs
Unescape View File

@ -5,6 +5,7 @@ using System.Web.Mvc;
using NLog;
using NzbDrone.Core.Helpers;
using NzbDrone.Core.Model;
using NzbDrone.Core.Model.Notification;
using NzbDrone.Core.Providers;
using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Providers.Indexer;
@ -25,16 +26,18 @@ namespace NzbDrone.Web.Controllers
private readonly QualityProvider _qualityProvider;
private readonly RootDirProvider _rootDirProvider;
private readonly AutoConfigureProvider _autoConfigureProvider;
private readonly NotificationProvider _notificationProvider;
public SettingsController(ConfigProvider configProvider, IndexerProvider indexerProvider,
QualityProvider qualityProvider, RootDirProvider rootDirProvider,
AutoConfigureProvider autoConfigureProvider)
AutoConfigureProvider autoConfigureProvider, NotificationProvider notificationProvider)
{
_configProvider = configProvider;
_indexerProvider = indexerProvider;
_qualityProvider = qualityProvider;
_rootDirProvider = rootDirProvider;
_autoConfigureProvider = autoConfigureProvider;
_notificationProvider = notificationProvider;
}
public ActionResult Index(string viewName)
@ -313,6 +316,10 @@ namespace NzbDrone.Web.Controllers
[HttpPost]
public ActionResult SaveGeneral(SettingsModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
try
{
foreach (var dir in data.Directories)
@ -324,15 +331,26 @@ namespace NzbDrone.Web.Controllers
{
Logger.Debug("Failed to save Root Dirs");
Logger.DebugException(ex.Message, ex);
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
[HttpPost]
public ActionResult SaveIndexers(IndexerSettingsModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
if (ModelState.IsValid)
{
var nzbsOrgSettings = _indexerProvider.GetSettings(typeof(NzbsOrgProvider));
@ -363,15 +381,23 @@ namespace NzbDrone.Web.Controllers
_configProvider.NewzbinUsername = data.NewzbinUsername;
_configProvider.NewzbinPassword = data.NewzbinPassword;
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
[HttpPost]
public ActionResult SaveDownloads(DownloadSettingsModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
if (ModelState.IsValid)
{
_configProvider.SyncFrequency = data.SyncFrequency.ToString();
@ -387,15 +413,23 @@ namespace NzbDrone.Web.Controllers
_configProvider.UseBlackhole = data.UseBlackHole;
_configProvider.BlackholeDirectory = data.BlackholeDirectory;
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
[HttpPost]
public ActionResult SaveQuality(QualityModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
if (ModelState.IsValid)
{
_configProvider.SetValue("DefaultQualityProfile", data.DefaultQualityProfileId.ToString());
@ -422,15 +456,23 @@ namespace NzbDrone.Web.Controllers
_qualityProvider.Update(profile);
}
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
[HttpPost]
public ActionResult SaveNotifications(NotificationSettingsModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
if (ModelState.IsValid)
{
_configProvider.SetValue("XbmcEnabled", data.XbmcEnabled.ToString());
@ -448,15 +490,23 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("XbmcUsername", data.XbmcUsername);
_configProvider.SetValue("XbmcPassword", data.XbmcPassword);
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
[HttpPost]
public ActionResult SaveEpisodeSorting(EpisodeSortingModel data)
{
var basicNotification = new BasicNotification();
basicNotification.Type = BasicNotificationType.Info;
basicNotification.AutoDismiss = true;
if (ModelState.IsValid)
{
_configProvider.SetValue("Sorting_ShowName", data.ShowName.ToString());
@ -470,9 +520,13 @@ namespace NzbDrone.Web.Controllers
_configProvider.SetValue("Sorting_NumberStyle", data.NumberStyle.ToString());
_configProvider.SetValue("Sorting_MultiEpisodeStyle", data.MultiEpisodeStyle.ToString());
basicNotification.Title = SETTINGS_SAVED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_SAVED);
}
basicNotification.Title = SETTINGS_FAILED;
_notificationProvider.Register(basicNotification);
return Content(SETTINGS_FAILED);
}
}

2
NzbDrone.Web/Views/Settings/Downloads.cshtml
Unescape View File

@ -216,7 +216,7 @@
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>
<script type="text/javascript">
var autoConfigureSabUrl = '@Url.Action("AutoConfigureSab", "Settings")';

2
NzbDrone.Web/Views/Settings/EpisodeSorting.cshtml
Unescape View File

@ -121,4 +121,4 @@
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>

2
NzbDrone.Web/Views/Settings/General.cshtml
Unescape View File

@ -50,7 +50,7 @@
</p>
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>
<script type="text/javascript">

2
NzbDrone.Web/Views/Settings/Indexers.cshtml
Unescape View File

@ -206,4 +206,4 @@
</div>
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>

2
NzbDrone.Web/Views/Settings/Notifications.cshtml
Unescape View File

@ -158,4 +158,4 @@
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>

2
NzbDrone.Web/Views/Settings/Quality.cshtml
Unescape View File

@ -63,7 +63,7 @@
</fieldset>
}
<div id="result"></div>
<div id="result" class="hiddenResult"></div>
<script type="text/javascript">

Write Preview
Loading…
Cancel
Save