From a5b08a54b6ab98b1e373b01ef1979148f4eaf08b Mon Sep 17 00:00:00 2001 From: "Jamie.Rees" Date: Wed, 29 Mar 2017 09:57:27 +0100 Subject: [PATCH] Fixed the issue where the recent changes page was not showing the correct date. #1296 --- Ombi.UI/Modules/UserLoginModule.cs | 2 +- Ombi.UI/Views/SystemStatus/Status.cshtml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Ombi.UI/Modules/UserLoginModule.cs b/Ombi.UI/Modules/UserLoginModule.cs index 58cd8255b..a8df7b990 100644 --- a/Ombi.UI/Modules/UserLoginModule.cs +++ b/Ombi.UI/Modules/UserLoginModule.cs @@ -692,7 +692,7 @@ namespace Ombi.UI.Modules // Let's find that user! var user = UserHelper.GetUser(username); - userId = user.UserId; + userId = user?.UserId ?? string.Empty; } UserLogins.Insert(new UserLogins { UserId = userId, Type = type, LastLoggedIn = DateTime.UtcNow }); diff --git a/Ombi.UI/Views/SystemStatus/Status.cshtml b/Ombi.UI/Views/SystemStatus/Status.cshtml index 232a29a78..c7955e00c 100644 --- a/Ombi.UI/Views/SystemStatus/Status.cshtml +++ b/Ombi.UI/Views/SystemStatus/Status.cshtml @@ -198,7 +198,7 @@ dataType: "json", success: function (response) { $(response).each(function (index, item) { - item.date = moment.utc(item.data).local().format('lll'); + item.date = moment.utc(item.date).local().format('lll'); var html = changesTemplate(item); $area.append(html); });