From 771b768ef280613d6261ec01e85b7e3894af7b27 Mon Sep 17 00:00:00 2001 From: miketwc1984 Date: Mon, 13 May 2024 16:19:22 -0400 Subject: [PATCH] job details add seconds --- htdocs/js/pages/JobDetails.class.js | 8 ++++---- lib/user.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/htdocs/js/pages/JobDetails.class.js b/htdocs/js/pages/JobDetails.class.js index 02a68ec..844c670 100644 --- a/htdocs/js/pages/JobDetails.class.js +++ b/htdocs/js/pages/JobDetails.class.js @@ -240,9 +240,9 @@ Class.subclass(Page.Base, "Page.JobDetails", { if (group || event.target) jobTarget = this.getNiceGroup(group, event.target, col_width); else if (job.nice_target) jobTarget = '
' + job.nice_target + '
'; - let jobStarted = get_nice_date_time(job.time_start, false, true); + let jobStarted = get_nice_date_time(job.time_start, true, true); if ((job.time_start - job.now >= 60) && !event.multiplex && !job.source) { - jobStarted = `${get_nice_date_time(job.time_start, false, true)}` + jobStarted = `${get_nice_date_time(job.time_start, true, true)}` } html += ''; @@ -265,7 +265,7 @@ Class.subclass(Page.Base, "Page.JobDetails", {
PLUGIN:
${jobPlugin}
MEMO:
${job.memo || '(None)'}
HOST:
${this.getNiceGroup(null, job.hostname, col_width)}
-
END:
${get_nice_date_time(job.time_end, false, true)}
+
END:
${get_nice_date_time(job.time_end, true, true)}
${jumpToHist }
@@ -818,7 +818,7 @@ Class.subclass(Page.Base, "Page.JobDetails", {
CAT:
${this.getNiceCategory(cat, col_width)}
TARGET:
${this.getNiceGroup(group, event.target, col_width) }
SOURCE:
${job.source || 'Scheduler'}
-
START:
${get_nice_date_time(job.time_start, false, true) }
+
START:
${get_nice_date_time(job.time_start, true, true) }
EVENT:
${eventTitle}
ARG:
${encode_entities(job.arg || '(None)')}
diff --git a/lib/user.js b/lib/user.js index 477a479..81ee3ed 100644 --- a/lib/user.js +++ b/lib/user.js @@ -1123,11 +1123,11 @@ module.exports = Class.create({ // remove passwords and salts for (var idx = 0, len = users.length; idx < len; idx++) { users[idx] = Tools.copyHashRemoveKeys(users[idx], { password: 1, salt: 1 }); - } - // sanitize - users[idx].email = users[idx].email.replace(/<.+>/g, ''); - users[idx].full_name = users[idx].full_name.replace(/<.+>/g, ''); + // sanitize + users[idx].email = users[idx].email.replace(/<.+>/g, ''); + users[idx].full_name = users[idx].full_name.replace(/<.+>/g, ''); + } // success, return users and list header callback({