Bug 179671: Boolean charts didn't work on the reporting pages.

r=jouni, a=justdave

diff --git a/report.cgi b/report.cgi
index 03ecfcb3f5430620168fc1b57be20200a6706ed7..66060723d0a0e01ae51daad269cc762f395cf511 100755 (executable)
--- a/report.cgi
+++ b/report.cgi
@@ -37,7 +37,7 @@ my $cgi = Bugzilla->cgi;
 if (grep(/^cmd-/, $cgi->param())) {
     my $params = $cgi->canonicalise_query("format", "ctype");
     my $location = "query.cgi?format=" . $cgi->param('query_format') . 
-      ($params ? "&$params" : "") . "\n\n";
+      ($params ? "&$params" : "");
 
     print $cgi->redirect($location);
     exit;

diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 015387b1158a967ce5ca7a38da317802b803f445..2fd458148ba7b6ef5f143ece83b31bffc3423dcc 100644 (file)
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -332,7 +332,8 @@ function selectProduct(f) {
 [% PROCESS "global/field-descs.none.tmpl" %]
 
 [%# If we resubmit to ourselves, we need to know if we are using a format. %]
-<input type="hidden" name="query_format" value="[% format FILTER html %]">
+[% thisformat = query_format != '' ? query_format : format %]
+<input type="hidden" name="query_format" value="[% thisformat FILTER html %]">
 
 [%# *** Summary *** %]