From d121bfbdebf5988861ae01ade83d4139e55cc837 Mon Sep 17 00:00:00 2001 From: Erwin Dondorp Date: Fri, 1 Apr 2022 15:20:19 +0200 Subject: [PATCH] fix for job start-time, which is a time-only field --- saltgui/static/scripts/output/OutputHighstateTaskFull.js | 3 ++- saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js | 4 ++-- saltgui/static/scripts/output/OutputHighstateTaskTerse.js | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/saltgui/static/scripts/output/OutputHighstateTaskFull.js b/saltgui/static/scripts/output/OutputHighstateTaskFull.js index 5617ffb30..be1c8b747 100644 --- a/saltgui/static/scripts/output/OutputHighstateTaskFull.js +++ b/saltgui/static/scripts/output/OutputHighstateTaskFull.js @@ -23,7 +23,8 @@ export class OutputHighstateTaskFull { } if (pTask.start_time) { - txt += "\n Started: " + Output.dateTimeStr(pTask.start_time); + const startTime = Output.dateTimeStr("1999, Sep 9 " + pTask.start_time, null, null, true); + txt += "\n Started: " + startTime; } if (pTask.duration >= 10) { diff --git a/saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js b/saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js index f02e2a957..1fb3037a1 100644 --- a/saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js +++ b/saltgui/static/scripts/output/OutputHighstateTaskSaltGui.js @@ -136,8 +136,8 @@ export class OutputHighstateTaskSaltGui { if (pTask["start_time"] !== undefined) { taskDiv.append(document.createElement("br")); - taskDiv.append(document.createTextNode( - indent + "Started at " + Output.dateTimeStr(pTask.start_time))); + const startTime = Output.dateTimeStr("1999, Sep 9 " + pTask.start_time, null, null, true); + taskDiv.append(document.createTextNode(indent + "Started at " + startTime)); } if (pTask["duration"] !== undefined) { diff --git a/saltgui/static/scripts/output/OutputHighstateTaskTerse.js b/saltgui/static/scripts/output/OutputHighstateTaskTerse.js index aeb3be58d..13e97ccc6 100644 --- a/saltgui/static/scripts/output/OutputHighstateTaskTerse.js +++ b/saltgui/static/scripts/output/OutputHighstateTaskTerse.js @@ -18,7 +18,8 @@ export class OutputHighstateTaskTerse { txt += "Clean"; } if (pTask.start_time) { - txt += " - Started: " + Output.dateTimeStr(pTask.start_time); + const startTime = Output.dateTimeStr("1999, Sep 9 " + pTask.start_time, null, null, true); + txt += " - Started: " + startTime; } if (pTask.duration >= 10) { txt += " - Duration: " + Output.getDuration(pTask.duration);