Skip to content

bugzilla
bugzilla
Commit 871d4b12 authored by lpsolit%gmail.com's avatar lpsolit%gmail.com
Browse files
Options

Bug 296180: Table and CSV reports should use localised terms for statuses and…

Bug 296180: Table and CSV reports should use localised terms for statuses and resolutions - Patch by Emmanuel Seyman <eseyman@linagora.com> - r/a=myk
parent 61ffaf7d
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 4 deletions
template/en/default/reports/report-table.csv.tmpl
View file @ 871d4b12
...@@ -43,14 +43,26 @@ ...@@ -43,14 +43,26 @@
[% title %], [% title %],
[% IF col_field -%] [% IF col_field -%]
[% FOREACH col = col_names -%] [% 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 -%] [% END -%]
[% ELSE -%] [% ELSE -%]
[% num_bugs %], [% num_bugs %],
[% END %] [% END %]
[% FOREACH row = row_names %] [% 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 %] [% FOREACH col = col_names %]
[% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %] [% IF data.$tbl AND data.$tbl.$col AND data.$tbl.$col.$row %]
[% data.$tbl.$col.$row -%], [% data.$tbl.$col.$row -%],
......
template/en/default/reports/report-table.html.tmpl
View file @ 871d4b12
...@@ -85,7 +85,13 @@ ...@@ -85,7 +85,13 @@
[% col_idx = 1 - col_idx %] [% col_idx = 1 - col_idx %]
<td class="[% classes.$row_idx.$col_idx %]"> <td class="[% classes.$row_idx.$col_idx %]">
[% col FILTER html FILTER replace('^ $','&nbsp;') %] [% IF col_field == 'bug_status' %]
[% status_descs.$col FILTER html FILTER replace('^ $','&nbsp;') %]
[% ELSIF col_field == 'resolution' %]
[% resolution_descs.$col FILTER html FILTER replace('^ $','&nbsp;') %]
[% ELSE %]
[% col FILTER html FILTER replace('^ $','&nbsp;') %]
[% END %]
</td> </td>
[% END %] [% END %]
<td class="ttotal"> <td class="ttotal">
...@@ -100,7 +106,13 @@ ...@@ -100,7 +106,13 @@
[% row_idx = 1 - row_idx %] [% row_idx = 1 - row_idx %]
<tr> <tr>
<td class="[% classes.$row_idx.$col_idx %]" align="right"> <td class="[% classes.$row_idx.$col_idx %]" align="right">
[% row FILTER html FILTER replace('^ $','&nbsp;') %] [% IF row_field == 'bug_status' %]
[% status_descs.$row FILTER html FILTER replace('^ $','&nbsp;') %]
[% ELSIF row_field == 'resolution' %]
[% resolution_descs.$row FILTER html FILTER replace('^ $','&nbsp;') %]
[% ELSE %]
[% row FILTER html FILTER replace('^ $','&nbsp;') %]
[% END %]
</td> </td>
[% FOREACH col = col_names %] [% FOREACH col = col_names %]
[% row_total = row_total + data.$tbl.$col.$row %] [% row_total = row_total + data.$tbl.$col.$row %]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment