github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Mass edit is now Series Editor.

Browse source 
Renamed Opps to Oops.
Fixed broken SeriesEditor.
This commit is contained in:
Mark McDowall 2012-02-23 14:31:50 -08:00
commit 0ff60bde92
15 changed files with 225 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

8
NzbDrone.Web/Controllers/CommandController.cs
View file

@ -72,7 +72,7 @@ namespace NzbDrone.Web.Controllers
if (_smtpProvider.SendTestEmail(server, port, ssl, username, password, fromAddress, toAddresses))
JsonNotificationResult.Info("Successfull", "Test email sent.");
return JsonNotificationResult.Opps("Couldn't send Email, please check your settings");
return JsonNotificationResult.Oops("Couldn't send Email, please check your settings");
}
public JsonResult GetTwitterAuthorization()
@ -80,7 +80,7 @@ namespace NzbDrone.Web.Controllers
var result = _twitterProvider.GetAuthorization();
if (result == null)
JsonNotificationResult.Opps("Couldn't get Twitter Authorization");
JsonNotificationResult.Oops("Couldn't get Twitter Authorization");
return new JsonResult { Data = result, JsonRequestBehavior = JsonRequestBehavior.AllowGet };
}
@ -90,7 +90,7 @@ namespace NzbDrone.Web.Controllers
var result = _twitterProvider.GetAndSaveAccessToken(token, verifier);
if (!result)
JsonNotificationResult.Opps("Couldn't verify Twitter Authorization");
JsonNotificationResult.Oops("Couldn't verify Twitter Authorization");
return JsonNotificationResult.Info("Good News!", "Successfully verified Twitter Authorization.");
@ -111,7 +111,7 @@ namespace NzbDrone.Web.Controllers
}
catch(Exception ex)
{
return JsonNotificationResult.Opps("Couldn't register and test Growl");
return JsonNotificationResult.Oops("Couldn't register and test Growl");
}
}

12
NzbDrone.Web/Controllers/SeriesController.cs
View file

@ -47,7 +47,7 @@ namespace NzbDrone.Web.Controllers
return View((object)serialized);
}
public ActionResult SeriesEditor(int seriesId)
public ActionResult SingleSeriesEditor(int seriesId)
{
var profiles = _qualityProvider.All();
ViewData["SelectList"] = new SelectList(profiles, "QualityProfileId", "Name");
@ -66,7 +66,7 @@ namespace NzbDrone.Web.Controllers
}
[HttpPost]
public EmptyResult SaveSeriesEditor(SeriesModel seriesModel)
public EmptyResult SaveSingleSeriesEditor(SeriesModel seriesModel)
{
var series = _seriesProvider.GetSeries(seriesModel.SeriesId);
series.Monitored = seriesModel.Monitored;
@ -133,7 +133,7 @@ namespace NzbDrone.Web.Controllers
return View(model);
}
public ActionResult MassEdit()
public ActionResult SeriesEditor()
{
var profiles = _qualityProvider.All();
ViewData["QualityProfiles"] = profiles;
@ -170,13 +170,13 @@ namespace NzbDrone.Web.Controllers
}
[HttpPost]
public JsonResult SaveMassEdit(List<Series> series)
public JsonResult SaveSeriesEditor(List<Series> series)
{
//Save edits
if (series == null || series.Count == 0)
return JsonNotificationResult.Opps("Invalid post data");
return JsonNotificationResult.Oops("Invalid post data");
_seriesProvider.UpdateFromMassEdit(series);
_seriesProvider.UpdateFromSeriesEditor(series);
return JsonNotificationResult.Info("Series Mass Edit Saved");
}

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

@ -279,7 +279,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult DeleteQualityProfile(int profileId)
{
if (_seriesProvider.GetAllSeries().Where(s => s.QualityProfileId == profileId).Count() != 0)
return JsonNotificationResult.Opps("Profile is still in use.");
return JsonNotificationResult.Oops("Profile is still in use.");
_qualityProvider.Delete(profileId);
@ -410,7 +410,7 @@ namespace NzbDrone.Web.Controllers
return GetSuccessResult();
}
return JsonNotificationResult.Opps("Invalid Data");
return JsonNotificationResult.Oops("Invalid Data");
}
[HttpPost]
@ -613,7 +613,7 @@ namespace NzbDrone.Web.Controllers
private JsonResult GetInvalidModelResult()
{
return JsonNotificationResult.Opps("Invalid post data");
return JsonNotificationResult.Oops("Invalid post data");
}
private SelectList GetProwlPrioritySelectList()

2
NzbDrone.Web/Controllers/SystemController.cs
View file

@ -163,7 +163,7 @@ namespace NzbDrone.Web.Controllers
public JsonResult RunJob(string typeName)
{
if (!_jobProvider.QueueJob(typeName))
return JsonNotificationResult.Opps("Invalid Job Name");
return JsonNotificationResult.Oops("Invalid Job Name");
return JsonNotificationResult.Info("Job Queued");
}