Bug 306695: Boolean charts forgets "0" values.

Patch by Marc Schumann <wurblzap@gmail.com>,
r=LpSolit, bugreport, a=justdave

diff --git a/Bugzilla/CGI.pm b/Bugzilla/CGI.pm
index b722aee3d3fa0bb01bab8408b80e1dfff486fe1d..bc2d39b998a73da69c7b063a15534b27e311b690 100644 (file)
--- a/Bugzilla/CGI.pm
+++ b/Bugzilla/CGI.pm
@@ -116,7 +116,7 @@ sub canonicalise_query {
         my $esc_key = url_quote($key);
 
         foreach my $value ($self->param($key)) {
-            if ($value) {
+            if (defined($value)) {
                 my $esc_value = url_quote($value);
 
                 push(@parameters, "$esc_key=$esc_value");

diff --git a/query.cgi b/query.cgi
index 9576966e1e7b4b3c6e7b4dcb91c6bdca8a8265c1..efd407ebcc32a5da0180172a67ca130573f40d4b 100755 (executable)
--- a/query.cgi
+++ b/query.cgi
@@ -376,9 +376,13 @@ for (my $chart = 0; $cgi->param("field$chart-0-0"); $chart++) {
     for (my $row = 0; $cgi->param("field$chart-$row-0"); $row++) {
         my @cols;
         for (my $col = 0; $cgi->param("field$chart-$row-$col"); $col++) {
+            my $value = $cgi->param("value$chart-$row-$col");
+            if (!defined($value)) {
+                $value = '';
+            }
             push(@cols, { field => $cgi->param("field$chart-$row-$col"),
                           type => $cgi->param("type$chart-$row-$col") || 'noop',
-                          value => $cgi->param("value$chart-$row-$col") || '' });
+                          value => $value });
         }
         push(@rows, \@cols);
     }