summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgerv%gerv.net <>2003-07-14 07:25:39 +0200
committergerv%gerv.net <>2003-07-14 07:25:39 +0200
commit94c8b7f2f167dc002172af42a088beed6685fc31 (patch)
treedfb7b6d29fb3b23fd848c670e3af74fc33c50c98
parent25271ddaedd0cffae571509009e99a8ab53d6093 (diff)
downloadbugzilla-94c8b7f2f167dc002172af42a088beed6685fc31.tar.gz
bugzilla-94c8b7f2f167dc002172af42a088beed6685fc31.tar.xz
Bug 204798 - Total in graph report is incorrect. Patch by kniht@us.ibm.com; r=gerv, a=justdave.
-rwxr-xr-xreport.cgi2
-rw-r--r--template/en/default/reports/report.html.tmpl12
2 files changed, 11 insertions, 3 deletions
diff --git a/report.cgi b/report.cgi
index de659ab25..487859190 100755
--- a/report.cgi
+++ b/report.cgi
@@ -198,7 +198,7 @@ foreach my $tbl (@tbl_names) {
push(@tbl_data, \@col_data);
}
- push(@image_data, \@tbl_data);
+ unshift(@image_data, \@tbl_data);
}
$vars->{'col_field'} = $col_field;
diff --git a/template/en/default/reports/report.html.tmpl b/template/en/default/reports/report.html.tmpl
index 321ad6ae8..31308c10c 100644
--- a/template/en/default/reports/report.html.tmpl
+++ b/template/en/default/reports/report.html.tmpl
@@ -94,8 +94,16 @@
[% imageurl = BLOCK %]report.cgi?[% imagebase %]&amp;format=
[% format FILTER url_quote %]&amp;ctype=png&amp;action=plot&amp;
- [% IF tbl_field AND tbl != "-total-" %]
- [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&amp;
+ [% IF tbl_field %]
+ [% IF tbl != "-total-" %]
+ [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&amp;
+ [% ELSE %]
+ [% FOREACH tblname = tbl_names %]
+ [% IF tblname != "-total-" %]
+ [% tbl_field FILTER url_quote %]=[% tblname FILTER url_quote %]&amp;
+ [% END %]
+ [% END %]
+ [% END %]
[% END %]width=[% width %]&amp;height=[% height %]
[% END %]