Bug 262848 : tabular reports don't show columns with empty header

Patch by Rob Siklos <robzilla@siklos.ca>   r=gerv  a=myk

diff --git a/report.cgi b/report.cgi
index a4df4d08fd4eb5ded47da89865029df1f4ab25ed..b89f507156d5794098b7ff42dd21a724f83f99ee 100755 (executable)
--- a/report.cgi
+++ b/report.cgi
@@ -164,6 +164,12 @@ my $tbl_isnumeric = 1;
 
 while (MoreSQLData()) {
     my ($row, $col, $tbl) = FetchSQLData();
+
+    # handle empty dimension member names
+    $row = ' ' if ($row eq '');
+    $col = ' ' if ($col eq '');
+    $tbl = ' ' if ($tbl eq '');
+
     $row = "" if ($row eq $columns{''});
     $col = "" if ($col eq $columns{''});
     $tbl = "" if ($tbl eq $columns{''});
@@ -324,7 +330,7 @@ sub get_names {
                   'rep_platform' => \@::legal_platform,
                   'op_sys'       => \@::legal_opsys,
                   'bug_status'   => \@::legal_bug_status,
-                  'resolution'   => \@::legal_resolution);
+                  'resolution'   => [' ', @::legal_resolution]);
     
     my $field_list = $fields{$field};
     my @sorted;

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 21ff1b87440968517abe32dd2e5808f4032dd398..3c90d5bf2f4cc4c67a6908254ef45a6661cb5dd4 100644 (file)
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -85,7 +85,7 @@
         
         [% col_idx = 1 - col_idx %]
         <td class="[% classes.$row_idx.$col_idx %]">
-          [% col FILTER html %]
+          [% col FILTER html FILTER replace('^ $','&nbsp;') %]
         </td>
       [% END %]
       <td class="ttotal">
@@ -100,7 +100,7 @@
     [% row_idx = 1 - row_idx %]
     <tr>
       <td class="[% classes.$row_idx.$col_idx %]" align="right">
-        [% row FILTER html %]
+        [% row FILTER html FILTER replace('^ $','&nbsp;') %]
       </td>
       [% FOREACH col = col_names %]
         [% row_total = row_total + data.$tbl.$col.$row %]