summaryrefslogtreecommitdiffstats
path: root/extensions/BMO/template
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-01-12 16:11:15 +0100
committerByron Jones <bjones@mozilla.com>2012-01-12 16:11:15 +0100
commitaed743e23b791f39cd3d31629fe65a36a623739f (patch)
treee3361975de8cbee9c32099c535e81dd2d08d774c /extensions/BMO/template
parent488547ec68fcc3de4a0fb63d469861ca74392ec9 (diff)
downloadbugzilla-aed743e23b791f39cd3d31629fe65a36a623739f.tar.gz
bugzilla-aed743e23b791f39cd3d31629fe65a36a623739f.tar.xz
Bug 715424: show both the insert time and run time for queued mail
Diffstat (limited to 'extensions/BMO/template')
-rw-r--r--extensions/BMO/template/en/default/pages/email_queue.html.tmpl17
1 files changed, 15 insertions, 2 deletions
diff --git a/extensions/BMO/template/en/default/pages/email_queue.html.tmpl b/extensions/BMO/template/en/default/pages/email_queue.html.tmpl
index 7afd083ac..0e4a37551 100644
--- a/extensions/BMO/template/en/default/pages/email_queue.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/email_queue.html.tmpl
@@ -17,14 +17,27 @@
<table id="report" cellspacing="0" border="0">
<tr id="report-header">
- <th>Time</th>
+ <th>Insert Time</th>
+ <th>Run Time</th>
+ <th>Age</th>
<th>Error Count</th>
<th>Last Error</th>
<th>Error Message</th>
</tr>
[% FOREACH job IN jobs %]
<tr class="report item [% loop.count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
- <td nowrap>[% time2str("%Y-%m-%d %H:%M:%S %Z", job.timestamp) FILTER html %]</td>
+ <td nowrap>[% time2str("%Y-%m-%d %H:%M:%S %Z", job.insert_time) FILTER html %]</td>
+ <td nowrap>[% time2str("%Y-%m-%d %H:%M:%S %Z", job.run_time) FILTER html %]</td>
+ <td nowrap>
+ [% age = now - job.insert_time %]
+ [% IF age < 60 %]
+ [% age FILTER none %]s
+ [% ELSIF age < 60 * 60 %]
+ [% age / 60 FILTER format('%.0f') %]m
+ [% ELSE %]
+ [% age / (60 * 60) FILTER format('%.0f') %]h
+ [% END %]
+ </td>
<td nowrap>[% job.error_count FILTER html %]</td>
<td nowrap>
[% IF job.error_count %]