Fix for bug 171480: make output for non requestee-specific requests look better in...

r=joel
a=justdave

diff --git a/template/en/default/request/queue.html.tmpl b/template/en/default/request/queue.html.tmpl
index edd87c45558e2d7fa0b03d2283054ac76d5e9ae6..a3449da8ef1ac91aa5d63fce96e2e878f2354283 100644 (file)
--- a/template/en/default/request/queue.html.tmpl
+++ b/template/en/default/request/queue.html.tmpl
@@ -63,8 +63,13 @@
     No requests.
   </p>
 [% ELSE %]
+  [% PROCESS start_new_table %]
   [% FOREACH request = requests %]
-    [% PROCESS start_new_table IF request.$group_field != group_value %]
+    [% IF request.$group_field != group_value %]
+      </table>
+      [% PROCESS start_new_table %]
+      [% group_value = request.$group_field %]
+    [% END %]
     <tr>
       [% FOREACH column = display_columns %]
         [% NEXT IF column == group_field || excluded_columns.contains(column) %]
@@ -146,8 +151,7 @@
 [% PROCESS global/footer.html.tmpl %]
 
 [% BLOCK start_new_table %]
-  [% "</table>" UNLESS group_value == "" %]
-  <h3>[% column_headers.$group_field %]: [% request.$group_field FILTER html %]</h3>
+  <h3>[% column_headers.$group_field %]: [% (request.$group_field || "None") FILTER html %]</h3>
   <table class="requests" cellspacing="0" cellpadding="4" border="1">
     <tr>
       [% FOREACH column = display_columns %]
@@ -155,7 +159,6 @@
         <th>[% column_headers.$column %]</th>
       [% END %]
     </tr>
-  [% group_value = request.$group_field %]
 [% END %]
 
 [% BLOCK display_type %]