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

94c8b7f2 · gerv%gerv.net · 25271dda · 94c8b7f2 · 94c8b7f2
Commit 94c8b7f2 authored Jul 14, 2003 by gerv%gerv.net
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 3 deletions

report.cgi report.cgi +1 -1

report.html.tmpl template/en/default/reports/report.html.tmpl +10 -2

No files found.
--- 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;

--- 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 %]