From 15dab754180d9855f6b1620b76dd06e4e3d835fb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Sun, 12 Feb 2017 21:46:14 +0000 Subject: [PATCH] Fixed #1090 --- .../RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs | 4 +++- Ombi.UI/Authentication/CustomAuthenticationProvider.cs | 6 ++++++ Ombi.UI/Views/Issues/Details.cshtml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs index ac5f82101..ca65135e2 100644 --- a/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs +++ b/Ombi.Services/Jobs/RecentlyAddedNewsletter/EmbyRecentlyAddedNewsletter.cs @@ -242,8 +242,10 @@ namespace Ombi.Services.Jobs.RecentlyAddedNewsletter public EmbySeriesInformation Series { get; set; } public List Episodes { get; set; } } - private void GenerateTvHtml(List tv, StringBuilder sb) + private void GenerateTvHtml(IEnumerable recenetlyAddedTv, StringBuilder sb) { + var tv = recenetlyAddedTv?.ToList() ?? new List(); + if (!tv.Any()) { return; diff --git a/Ombi.UI/Authentication/CustomAuthenticationProvider.cs b/Ombi.UI/Authentication/CustomAuthenticationProvider.cs index 672161e4e..6ab0d522c 100644 --- a/Ombi.UI/Authentication/CustomAuthenticationProvider.cs +++ b/Ombi.UI/Authentication/CustomAuthenticationProvider.cs @@ -208,11 +208,17 @@ namespace Ombi.UI.Authentication var plexUsers = configuration.PlexUserRepository.GetAll(); var plexUser = plexUsers.FirstOrDefault(x => Guid.Parse(x.LoginId) == userGuid); + var embyUsers = configuration.EmbyUserRepository.GetAll(); + var embyUser = embyUsers.FirstOrDefault(x => Guid.Parse(x.LoginId) == userGuid); if (plexUser != null) { identity.UserName = plexUser.Username; } + if (embyUser != null) + { + identity.UserName = embyUser.Username; + } var localUsers = configuration.LocalUserRepository.GetAll(); diff --git a/Ombi.UI/Views/Issues/Details.cshtml b/Ombi.UI/Views/Issues/Details.cshtml index da025b9cc..c5567209a 100644 --- a/Ombi.UI/Views/Issues/Details.cshtml +++ b/Ombi.UI/Views/Issues/Details.cshtml @@ -18,7 +18,7 @@
- +

Issues For "@Model.Title"