github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/tidusjar/Ombi into dev

Browse source
This commit is contained in:
tidusjar 2017-02-17 21:36:42 +00:00
commit 74125286b5
5 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ombi.Core.Migration/Migrations/Version1100.cs
View file

@ -181,7 +181,7 @@ namespace Ombi.Core.Migration.Migrations
try try
{ {
var settings = PlexSettings.GetSettings(); var settings = PlexSettings.GetSettings();
if (string.IsNullOrEmpty(settings.PlexAuthToken)) if (string.IsNullOrEmpty(settings.PlexAuthToken) || !settings.Enable)
{ {
return; return;
} }

1
Ombi.Core.Migration/Migrations/Version195.cs
View file

@ -62,6 +62,7 @@ namespace Ombi.Core.Migration.Migrations
private void UpdateApplicationSettings() private void UpdateApplicationSettings()
{ {
var plex = PlexRequestSettings.GetSettings(); var plex = PlexRequestSettings.GetSettings();
var jobSettings = Jobs.GetSettings(); var jobSettings = Jobs.GetSettings();
var newsLetter = NewsletterSettings.GetSettings(); var newsLetter = NewsletterSettings.GetSettings();

7
Ombi.Core.Migration/Migrations/Version2200.cs
View file

@ -68,8 +68,11 @@ namespace Ombi.Core.Migration.Migrations
{ {
#if !DEBUG #if !DEBUG
var s = PlexSettings.GetSettings(); var s = PlexSettings.GetSettings();
s.Enable = true; if (!string.IsNullOrEmpty(s.Ip))
PlexSettings.SaveSettings(s); {
s.Enable = true;
PlexSettings.SaveSettings(s);
}
#endif #endif
} }
private void UpdateCustomSettings() private void UpdateCustomSettings()

2
Ombi.UI/Modules/IssuesModule.cs
View file

@ -145,7 +145,7 @@ namespace Ombi.UI.Modules
Deleted = issue.Deleted, Deleted = issue.Deleted,
Type = issue.Type, Type = issue.Type,
ProviderId = issue.ProviderId, ProviderId = issue.ProviderId,
PosterUrl = issue.PosterUrl, PosterUrl = issue.PosterUrl.Contains("https://image.tmdb.org/t/p/w150/") ? issue.PosterUrl : $"https://image.tmdb.org/t/p/w150/{issue.PosterUrl}",
Id = issue.Id Id = issue.Id
}; };
return View["Details", m]; return View["Details", m];

2
Ombi.UI/Views/Issues/Details.cshtml
View file

@ -18,7 +18,7 @@
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<img src="https://image.tmdb.org/t/p/w150/@Model.PosterUrl" /> <img src="@Model.PosterUrl" />
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<h4>Issues For "@Model.Title"</h4> <h4>Issues For "@Model.Title"</h4>