From 290029c1c1ba8b3f1ef18b56c94f947bd550d056 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 24 Apr 2013 12:52:26 +0800
Subject: Bug 853483: Triage report times out on Firefox (Any) query

---
 .../en/default/hook/global/user-error-errors.html.tmpl      |  4 ++++
 .../BMO/template/en/default/pages/email_queue.html.tmpl     | 13 +++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'extensions/BMO/template/en')

diff --git a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
index eff0e35cc..aaf23fff5 100644
--- a/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -33,4 +33,8 @@
 [% ELSIF error == "invalid_object" %]
     Invalid [% object FILTER html %]: "[% value FILTER html %]"
 
+[% ELSIF error == "report_too_many_bugs" %]
+  [% title = "Too Many Bugs" %]
+  Too many [% terms.bugs %] matched your selection criteria.
+
 [% END %]
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 5c7970506..f0c750129 100644
--- a/extensions/BMO/template/en/default/pages/email_queue.html.tmpl
+++ b/extensions/BMO/template/en/default/pages/email_queue.html.tmpl
@@ -15,7 +15,7 @@
 
   <p><i>[% jobs.size FILTER none %] email(s) in the queue.</i></p>
 
-  <table id="report" class="hover" cellspacing="0" border="0">
+  <table id="report" class="hover" cellspacing="0" border="0" width="100%">
   <tr id="report-header">
     <th>Insert Time</th>
     <th>Run Time</th>
@@ -47,13 +47,14 @@
         [% END %]
       </td>
       <td>
-        [% IF job.error_count %]
-          [% job.error_message FILTER html %]
-        [% ELSE %]
-          -
-        [% END %]
+        [% job.error_count ? job.error_message : '-' FILTER html %]
       </td>
     </tr>
+    [% IF job.subject %]
+      <tr class="report item [% loop.count % 2 == 1 ? "report_row_odd" : "report_row_even" %]">
+        <td colspan="6">&nbsp;&nbsp;&nbsp;[% job.subject FILTER html %]</td>
+      </tr>
+    [% END %]
   [% END %]
   </table>
 
-- 
cgit v1.2.3-24-g4f1b