Skip to content

Commit

Permalink
Merge pull request #4709 from thornbill/backport-4692
Browse files Browse the repository at this point in the history
Fix scheduled task time limit key
  • Loading branch information
thornbill authored Jul 8, 2023
2 parents 331fa87 + b67f4ec commit b2f3720
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/controllers/dashboard/scheduledtasks/scheduledtask.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ import confirm from '../../../components/confirm/confirm';

html += '<div class="listItem listItem-border">';
html += '<span class="material-icons listItemIcon schedule" aria-hidden="true"></span>';
if (trigger.MaxRuntimeMs) {
if (trigger.MaxRuntimeTicks) {
html += '<div class="listItemBody two-line">';
} else {
html += '<div class="listItemBody">';
}
html += "<div class='listItemBodyText'>" + ScheduledTaskPage.getTriggerFriendlyName(trigger) + '</div>';
if (trigger.MaxRuntimeMs) {
if (trigger.MaxRuntimeTicks) {
html += '<div class="listItemBodyText secondary">';
const hours = trigger.MaxRuntimeTicks / 36e9;
if (hours == 1) {
Expand Down Expand Up @@ -202,7 +202,7 @@ import confirm from '../../../components/confirm/confirm';
let timeLimit = $('#txtTimeLimit', page).val() || '0';
timeLimit = parseFloat(timeLimit) * 3600000;

trigger.MaxRuntimeMs = timeLimit || null;
trigger.MaxRuntimeTicks = timeLimit * 1e4 || null;

return trigger;
}
Expand Down

0 comments on commit b2f3720

Please sign in to comment.