diff options
| -rw-r--r-- | template/en/default/reports/report-table.csv.tmpl | 16 | ||||
| -rw-r--r-- | template/en/default/reports/report-table.html.tmpl | 16 |
2 files changed, 28 insertions, 4 deletions
diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl index 216419fea..42fcd6686 100644 --- a/template/en/default/reports/report-table.csv.tmpl +++ b/template/en/default/reports/report-table.csv.tmpl @@ -43,14 +43,26 @@ [% title %], [% IF col_field -%] [% FOREACH col = col_names -%] - [% col FILTER csv -%], + [% IF col_field == 'bug_status' %] + [% status_descs.$col FILTER csv -%] + [% ELSIF col_field == 'resolution' %] + [% resolution_descs.$col FILTER csv -%] + [% ELSE %] + [% col FILTER csv -%], + [% END %] [% END -%] [% ELSE -%] [% num_bugs %], [% END %] [% FOREACH row = row_names %] - [% row FILTER csv -%], +[% IF row_field == 'bug_status' %] + [% status_descs.$row FILTER csv -%] + [% ELSIF row_field == 'resolution' %] + [% resolution_descs.$row FILTER csv -%] + [% ELSE %] + [% row FILTER csv -%], + [% END %] [% FOREACH col = col_names %] [% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %] [% data.$tbl.$col.$row -%], diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 3c90d5bf2..0e2ae62c8 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -85,7 +85,13 @@ [% col_idx = 1 - col_idx %] <td class="[% classes.$row_idx.$col_idx %]"> - [% col FILTER html FILTER replace('^ $',' ') %] + [% IF col_field == 'bug_status' %] + [% status_descs.$col FILTER html FILTER replace('^ $',' ') %] + [% ELSIF col_field == 'resolution' %] + [% resolution_descs.$col FILTER html FILTER replace('^ $',' ') %] + [% ELSE %] + [% col FILTER html FILTER replace('^ $',' ') %] + [% END %] </td> [% END %] <td class="ttotal"> @@ -100,7 +106,13 @@ [% row_idx = 1 - row_idx %] <tr> <td class="[% classes.$row_idx.$col_idx %]" align="right"> - [% row FILTER html FILTER replace('^ $',' ') %] + [% IF row_field == 'bug_status' %] + [% status_descs.$row FILTER html FILTER replace('^ $',' ') %] + [% ELSIF row_field == 'resolution' %] + [% resolution_descs.$row FILTER html FILTER replace('^ $',' ') %] + [% ELSE %] + [% row FILTER html FILTER replace('^ $',' ') %] + [% END %] </td> [% FOREACH col = col_names %] [% row_total = row_total + data.$tbl.$col.$row %] |