Hide disabled and empty fields in show-multiple

template/en/default/bug/show-multiple.html.tmpl

@@ -41,7 +41,7 @@
   [% END %]
   [% FOREACH bug = bugs %]
     [% PROCESS bug_display error=0 %]
-    [% ids.push(bug.bug_id) %]
+        [% ids.push(bug.bug_id) %]
   [% END %]
   [% IF ids.size > 1 %]
     <div class="bz_query_buttons">
@@ -70,6 +70,7 @@
       (<a href="show_bug.cgi?id=[% bug.alias | url_quote %]">
         [% bug.alias | html %]</a>)
     [% END %]
+    - <span id="short_desc">[% bug.short_desc | html %]</span>
   </h1>
 
   <table class="bugfields">
@@ -95,7 +96,6 @@
     [% IF Bugzilla.get_field('qa_contact').enabled %]
       [% rightcells.push('qa_contact') %]
     [% END %]
-    [% rightcells.push('') %]
     [% IF bug.cc %]
       [% rightcells.push('cc') %]
     [% END %]
@@ -111,8 +111,6 @@
       [% END %]
     [% END %]
 
-    [% PROCESS row cell = "short_desc" fullrow = 1 %]
-
     <tr>
       <th>[% field_descs.product | html %]:</th>
       <td>
@@ -175,18 +173,21 @@
       </tr>
     [% END %]
 
-    [% IF Bugzilla.get_field('status_whiteboard').enabled %]
+    [% IF Bugzilla.get_field('status_whiteboard').enabled && bug.status_whiteboard.length %]
       [% PROCESS row cell = "status_whiteboard" fullrow = 1 %]
     [% END %]
 
     [% field_counter = 0 %]
     [% FOREACH field = Bugzilla.active_custom_fields %]
-      [% field_counter = field_counter + 1 %]
-      [%# Odd-numbered fields get an opening <tr> %]
-      [% '<tr>' IF field_counter % 2 %]
-      [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %]
-      [%# Even-numbered fields get a closing <tr> %]
-      [% '</tr>' IF !(field_counter % 2) %]
+      [% IF (field.type == constants.FIELD_TYPE_MULTI_SELECT || field.type == constants.FIELD_TYPE_BUG_ID_REV)
+        ? bug.${field.name}.size : bug.${field.name} %]
+        [% field_counter = field_counter + 1 %]
+        [%# Odd-numbered fields get an opening <tr> %]
+        [% '<tr>' IF field_counter % 2 %]
+        [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %]
+        [%# Even-numbered fields get a closing <tr> %]
+        [% '</tr>' IF !(field_counter % 2) %]
+      [% END %]
     [% END %]
     [%# And we have to finish the row if we ended on an odd number. %]
     [% '<th></th><td></td></tr>' IF field_counter % 2 %]
@@ -220,7 +221,9 @@
           </table>
         </td>
       </tr>
-      [% PROCESS row cell="deadline" %]
+      [% IF bug.deadline %]
+        [% PROCESS row cell="deadline" %]
+      [% END %]
     [% END %]
 
     [% IF bug.attachments.size %]