Removed Plex Request from the notifications

pull/1061/head
tidusjar 8 years ago
parent 267e41dafb
commit 29c8b456f4

@ -100,9 +100,9 @@ namespace Ombi.Api
var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url), var obj = RetryHandler.Execute<CouchPotatoStatus>(() => Api.Execute<CouchPotatoStatus>(request, url),
(exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan), new TimeSpan[] { (exception, timespan) => Log.Error(exception, "Exception when calling GetStatus for CP, Retrying {0}", timespan), new TimeSpan[] {
TimeSpan.FromSeconds (1),
TimeSpan.FromSeconds(2), TimeSpan.FromSeconds(2),
TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(3)});
TimeSpan.FromSeconds(10)});
return obj; return obj;
} }
@ -140,9 +140,9 @@ namespace Ombi.Api
{ {
var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoMovies>(request, baseUrl), var obj = RetryHandler.Execute(() => Api.Execute<CouchPotatoMovies>(request, baseUrl),
(exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan), new[] { (exception, timespan) => Log.Error(exception, "Exception when calling GetMovies for CP, Retrying {0}", timespan), new[] {
TimeSpan.FromSeconds (1),
TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5),
TimeSpan.FromSeconds(10), TimeSpan.FromSeconds(5)
TimeSpan.FromSeconds(30)
}); });
return obj; return obj;

@ -52,8 +52,8 @@ namespace Ombi.Core.Migration.Migrations
public void Start(IDbConnection con) public void Start(IDbConnection con)
{ {
UpdatePlexSettings(); UpdatePlexSettings();
//UpdateCustomSettings(); Turned off the migration for now until the search has been improved on. UpdateCustomSettings();
//UpdateSchema(con, Version); UpdateSchema(con, Version);
} }
private void UpdatePlexSettings() private void UpdatePlexSettings()
@ -68,7 +68,7 @@ namespace Ombi.Core.Migration.Migrations
{ {
var settings = Customization.GetSettings(); var settings = Customization.GetSettings();
settings.NewSearch = true; // Use the new search settings.EnableIssues = true;
Customization.SaveSettings(settings); Customization.SaveSettings(settings);

@ -144,7 +144,7 @@
<table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%"> <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
<tr> <tr>
<td align="center"> <td align="center">
<img src="http://i.imgur.com/ROTp8mn.png" text-align="center" /> <img src="http://i.imgur.com/qQsN78U.png" width="400px" text-align="center" />
</td> </td>
</tr> </tr>
<tr> <tr>

@ -54,6 +54,7 @@ namespace Ombi.Core.SettingModels
public int DefaultLang { get; set; } public int DefaultLang { get; set; }
public bool NewSearch { get; set; } public bool NewSearch { get; set; }
public bool EnableIssues { get; set; }
} }
} }

@ -144,7 +144,7 @@
<table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%"> <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
<tr> <tr>
<td align="center"> <td align="center">
<img src="http://i.imgur.com/ROTp8mn.png" text-align="center" /> <img src="http://i.imgur.com/qQsN78U.png" width="400px" text-align="center" />
</td> </td>
</tr> </tr>
<tr> <tr>

@ -144,7 +144,7 @@
<table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%"> <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;" width="100%">
<tr> <tr>
<td align="center"> <td align="center">
<img src="http://i.imgur.com/ROTp8mn.png" text-align="center" /> <img src="http://i.imgur.com/qQsN78U.png" width="400px" text-align="center" />
</td> </td>
</tr> </tr>
<tr> <tr>

@ -314,6 +314,7 @@ namespace Ombi.UI.Helpers
{ {
url = $"/{content}{url}"; url = $"/{content}{url}";
} }
var returnString = context.Request.Path == url ? var returnString = context.Request.Path == url ?
$"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>" $"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>"
: $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>"; : $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title}</a></li>";
@ -328,7 +329,14 @@ namespace Ombi.UI.Helpers
{ {
url = $"/{content}{url}"; url = $"/{content}{url}";
} }
if (url.Contains("issues"))
{
var custom = GetCustomizationSettings();
if (!custom.EnableIssues)
{
return helper.Raw(string.Empty);
}
}
var returnString = context.Request.Path == url var returnString = context.Request.Path == url
? $"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>" ? $"<li class=\"active\"><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>"
: $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>"; : $"<li><a href=\"{url}\"><i class=\"fa fa-{fontIcon}\"></i> {title} {extraHtml}</a></li>";

@ -104,7 +104,8 @@
</div> </div>
</div> </div>
@Html.Checkbox(Model.Settings.NewSearch, "NewSearch", "Use New Search") @*@Html.Checkbox(Model.Settings.NewSearch, "NewSearch", "Use New Search")*@
@Html.Checkbox(Model.Settings.EnableIssues, "EnableIssues", "Enable Issues")
<div class="form-group"> <div class="form-group">
<div> <div>
<button type="submit" id="save" class="btn btn-primary-outline">Submit</button> <button type="submit" id="save" class="btn btn-primary-outline">Submit</button>

Loading…
Cancel
Save