From: justdave%bugzilla.org <>
Date: Sun, 30 May 2004 17:40:16 +0000 (+0000)
Subject: Bug 179671: Boolean charts didn't work on the reporting pages.
X-Git-Tag: bugzilla-2.18rc1~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ca6f2c2edc03a15adf06374015edbfb0a58ecb;p=thirdparty%2Fbugzilla.git

Bug 179671: Boolean charts didn't work on the reporting pages.
r=jouni, a=justdave
---

diff --git a/report.cgi b/report.cgi
index 03ecfcb3f5..66060723d0 100755
--- 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 015387b115..2fd458148b 100644
--- 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 *** %]