From 3e4c503273cd8c1ab6e9dce41ce507ca2caa1885 Mon Sep 17 00:00:00 2001
From: "gerv%gerv.net" <>
Date: Mon, 18 Nov 2002 07:56:25 +0000
Subject: Bug 180205 - General reporting fixes. Fixes bug 180151 (Grand total
 links are messed up when axis is restricted), bug 180105 (CSV reports
 occasionally break), bug 179671 (Boolean charts are broken on reporting
 pages), bug 179887 (report.cgi should |require Data::Dumper|, not |use|), and
 works around bug 179581 (Keyword combinations report not very useful). Patch
 by gerv; r=bbaetz, a=justdave.

---
 template/en/default/search/form.html.tmpl                 |  3 +++
 template/en/default/search/search-advanced.html.tmpl      |  2 --
 template/en/default/search/search-report-select.html.tmpl | 10 +++++-----
 template/en/default/search/search.html.tmpl               |  2 --
 4 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'template/en/default/search')

diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index a24772c31..2f95748ed 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -329,6 +329,9 @@ function selectProduct(f) {
 
 [% PROCESS "global/field-descs.html.tmpl" %]
 
+[%# If we resubmit to ourselves, we need to know if we are using a format. %]
+<input type="hidden" name="query_format" value="[% format %]">
+
 [%# *** Summary *** %]
 
 <table>
diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl
index d1614ae3a..4dd197218 100644
--- a/template/en/default/search/search-advanced.html.tmpl
+++ b/template/en/default/search/search-advanced.html.tmpl
@@ -33,8 +33,6 @@
 [% button_name = "Search" %]
 
 <form method="get" action="buglist.cgi" name="queryform">
-  [%# If we resubmit to ourselves, we need to know if we are using a format. %]
-  <input type="hidden" name="query_format" value="[% format %]">
   
 [% PROCESS search/form.html.tmpl %]
 
diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl
index 75716eac7..9af620d34 100644
--- a/template/en/default/search/search-report-select.html.tmpl
+++ b/template/en/default/search/search-report-select.html.tmpl
@@ -27,15 +27,15 @@
 [% PROCESS "global/field-descs.html.tmpl" %]
 
 [% BLOCK select %]
-  [% fields = ["product", "component", "version", "rep_platform",  
-               "op_sys", "bug_status", "resolution", "bug_severity", 
-               "priority", "target_milestone", "keywords", "assigned_to",
-               "reporter", "qa_contact", "votes" ] %]
+  [% rep_fields = ["product", "component", "version", "rep_platform",  
+                   "op_sys", "bug_status", "resolution", "bug_severity", 
+                   "priority", "target_milestone", "assigned_to",
+                   "reporter", "qa_contact", "votes" ] %]
 
   <select name="[% name FILTER html %]">
     <option value="">&lt;none&gt;</option>
     
-    [% FOREACH field = fields %]
+    [% FOREACH field = rep_fields %]
       [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %]
       [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %]
       [% NEXT IF field == "votes" AND !Param('usevotes') %]      
diff --git a/template/en/default/search/search.html.tmpl b/template/en/default/search/search.html.tmpl
index d1614ae3a..4dd197218 100644
--- a/template/en/default/search/search.html.tmpl
+++ b/template/en/default/search/search.html.tmpl
@@ -33,8 +33,6 @@
 [% button_name = "Search" %]
 
 <form method="get" action="buglist.cgi" name="queryform">
-  [%# If we resubmit to ourselves, we need to know if we are using a format. %]
-  <input type="hidden" name="query_format" value="[% format %]">
   
 [% PROCESS search/form.html.tmpl %]
 
-- 
cgit v1.2.3-24-g4f1b