From 9b450558d9cb0b3d4974be305608936432900a7e Mon Sep 17 00:00:00 2001 From: Erwin Dondorp Date: Fri, 24 Dec 2021 17:09:53 +0100 Subject: [PATCH] ARTEMIS-3621 show 'zero' timestamp as 'N/A' (instead of 1970...) --- .../src/main/webapp/plugin/js/components/browse.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js index 71f0d603ae..e799bdcb20 100644 --- a/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js +++ b/artemis-hawtio/artemis-plugin/src/main/webapp/plugin/js/components/browse.js @@ -481,7 +481,7 @@ var Artemis; // "HH:mm:ss ago" return hours + ":" + mins + ":" + secs + " ago"; } - // "in HH:mm:ss ago" + // "in HH:mm:ss" return "in " + hours + ":" + mins + ":" + secs; } return formatTimestamp(timestamp); @@ -491,6 +491,9 @@ var Artemis; if (isNaN(timestamp) || typeof timestamp !== "number") { return timestamp; } + if (timestamp === 0) { + return "N/A"; + } var d = new Date(timestamp); // "yyyy-MM-dd HH:mm:ss" //add 1 to month as getmonth returns the position not the actual month @@ -526,7 +529,7 @@ var Artemis; } function formatPersistentSize(bytes) { - if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "n/a"; + if(isNaN(bytes) || typeof bytes !== "number" || bytes < 0) return "N/A"; if(bytes < 10240) return bytes.toLocaleString() + " Bytes"; if(bytes < 1048576) return (bytes / 1024).toFixed(2) + " KB"; if(bytes < 1073741824) return (bytes / 1048576).toFixed(2) + " MB";