Bug 204798 - Total in graph report is incorrect. Patch by kniht@us.ibm.com; r=gerv...

diff --git a/report.cgi b/report.cgi
index de659ab25b8c7f0f2d00eef12e42be52298d7b69..487859190bdf2a25ab80d62797d5d925df0efd41 100755 (executable)
--- 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 321ad6ae8d47533a4c680ef0256dbe4eb42c7192..31308c10c719651e372df0eb9e4ec338a64a14ad 100644 (file)
--- 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 %]&format=
         [% format FILTER url_quote %]&ctype=png&action=plot&
-        [% IF tbl_field AND tbl != "-total-" %]
-          [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&
+        [% IF tbl_field %]
+          [% IF tbl != "-total-" %]
+            [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %]&
+          [% ELSE %]
+            [% FOREACH tblname = tbl_names %]
+              [% IF tblname != "-total-" %]
+                [% tbl_field FILTER url_quote %]=[% tblname FILTER url_quote %]&
+              [% END %]
+            [% END %]
+          [% END %]
         [% END %]width=[% width %]&height=[% height %]      
       [% END %]