kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 03:25:50 +00:00
Code Issues Projects Releases Wiki Activity

Don't show relative time for invalid dates

Browse Source
This commit is contained in:
Bernd Bestel
2022-04-07 18:12:49 +02:00
parent 35474f2466
commit 73e539604f
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/js/grocy.js
View File

@@ -344,6 +344,12 @@ RefreshContextualTimeago = function(rootSelector = "#page-content")
return return
} }
if (!moment(timestamp).isValid())
{
element.text("")
return
}
var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31"; var isNever = timestamp && timestamp.substring(0, 10) == "2999-12-31";
var isToday = timestamp && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD"); var isToday = timestamp && timestamp.substring(0, 10) == moment().format("YYYY-MM-DD");
var isDateWithoutTime = element.hasClass("timeago-date-only"); var isDateWithoutTime = element.hasClass("timeago-date-only");
@@ -425,9 +431,15 @@ Grocy.FrontendHelpers.ShowGenericError = function(message, exception)
toastr.error(__t(message) + '<br><br>' + __t('Click to show technical details'), '', { toastr.error(__t(message) + '<br><br>' + __t('Click to show technical details'), '', {
onclick: function() onclick: function()
{ {
var errorDetails = JSON.stringify(exception, null, 4);
if (typeof exception === "object" && exception !== null && exception.hasOwnProperty("error_message"))
{
errorDetails = exception.error_message;
}
bootbox.alert({ bootbox.alert({
title: __t('Error details'), title: __t('Error details'),
message: '<pre class="my-0"><code>' + JSON.stringify(exception, null, 4) + '</code></pre>', message: '<p class="text-monospace my-0">' + errorDetails + '</p>',
closeButton: false closeButton: false
}); });
} }