diff options
-rwxr-xr-x | report.cgi | 8 | ||||
-rw-r--r-- | template/en/default/reports/report-table.html.tmpl | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/report.cgi b/report.cgi index 42dc390cb..a2beeebf1 100755 --- a/report.cgi +++ b/report.cgi @@ -170,6 +170,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{''}); @@ -330,7 +336,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 21ff1b874..3c90d5bf2 100644 --- 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('^ $',' ') %] </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('^ $',' ') %] </td> [% FOREACH col = col_names %] [% row_total = row_total + data.$tbl.$col.$row %] |