From 9c3b9ca6f68bd8637d4a506879b9b514c7188d03 Mon Sep 17 00:00:00 2001 From: vfilippov Date: Fri, 23 Dec 2011 12:40:08 +0000 Subject: [PATCH] Bug 90854 - Fix field names in reports git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1481 6955db30-a419-402b-8a0d-67ecbb4d7f56 --- template/en/default/reports/report-bar.png.tmpl | 2 +- template/en/default/reports/report-line.png.tmpl | 2 +- template/en/default/reports/report-pie.png.tmpl | 2 +- template/en/default/reports/report-table.csv.tmpl | 6 +++--- template/en/default/reports/report-table.html.tmpl | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/template/en/default/reports/report-bar.png.tmpl b/template/en/default/reports/report-bar.png.tmpl index cd427d6c0..8edad97cf 100644 --- a/template/en/default/reports/report-bar.png.tmpl +++ b/template/en/default/reports/report-bar.png.tmpl @@ -20,7 +20,7 @@ [% y_label = "$terms.Bugs" %] -[% col_field_disp = field_descs.$col_field || col_field %] +[% col_field_disp = field_descs.$col_field || Bugzilla.get_field(col_field).description || col_field %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = data.0.0.$i %] diff --git a/template/en/default/reports/report-line.png.tmpl b/template/en/default/reports/report-line.png.tmpl index 20c7649b0..72d8a707a 100644 --- a/template/en/default/reports/report-line.png.tmpl +++ b/template/en/default/reports/report-line.png.tmpl @@ -20,7 +20,7 @@ [% y_label = "$terms.Bugs" %] -[% col_field_disp = field_descs.$col_field || col_field %] +[% col_field_disp = field_descs.$col_field || Bugzilla.get_field(col_field).description || col_field %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = data.0.0.$i %] diff --git a/template/en/default/reports/report-pie.png.tmpl b/template/en/default/reports/report-pie.png.tmpl index 9bbdbe261..ba626926c 100644 --- a/template/en/default/reports/report-pie.png.tmpl +++ b/template/en/default/reports/report-pie.png.tmpl @@ -18,7 +18,7 @@ # Contributor(s): Gervase Markham #%] -[% col_field_disp = field_descs.$col_field || col_field %] +[% col_field_disp = field_descs.$col_field || Bugzilla.get_field(col_field).description || col_field %] [% FOR i IN [ 0 .. data.0.0.max ] %] [% data.0.0.$i = data.0.0.$i %] diff --git a/template/en/default/reports/report-table.csv.tmpl b/template/en/default/reports/report-table.csv.tmpl index ce05deed2..dfae8b459 100644 --- a/template/en/default/reports/report-table.csv.tmpl +++ b/template/en/default/reports/report-table.csv.tmpl @@ -23,9 +23,9 @@ [% colsepchar = user.settings.csv_colsepchar.value %] [% num_bugs = BLOCK %]Number of [% terms.bugs %][% END %] -[% tbl_field_disp = field_descs.$tbl_field || tbl_field %] -[% col_field_disp = field_descs.$col_field || col_field %] -[% row_field_disp = field_descs.$row_field || row_field %] +[% tbl_field_disp = field_descs.$tbl_field || Bugzilla.get_field(tbl_field).description || tbl_field %] +[% col_field_disp = field_descs.$col_field || Bugzilla.get_field(col_field).description || col_field %] +[% row_field_disp = field_descs.$row_field || Bugzilla.get_field(row_field).description || row_field %] [% IF tbl_field %] [% IF tbl_field == 'assigned_to' OR tbl_field == 'reporter' diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl index 84ff6fc3f..4e7a1e779 100644 --- a/template/en/default/reports/report-table.html.tmpl +++ b/template/en/default/reports/report-table.html.tmpl @@ -30,8 +30,8 @@ # tbl: Name of a hash in data which is the table to be plotted. #%] -[% col_field_disp = field_descs.$col_field || col_field %] -[% row_field_disp = field_descs.$row_field || row_field %] +[% col_field_disp = field_descs.$col_field || Bugzilla.get_field(col_field).description || col_field %] +[% row_field_disp = field_descs.$row_field || Bugzilla.get_field(row_field).description || row_field %] [% urlbase = buglistbase; IF row_field;