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.

5 files changed, 17 insertions, 13 deletions

diff --git a/template/en/default/reports/report-table.html.tmpl b/template/en/default/reports/report-table.html.tmpl
index 5074484c3..e984dc6ae 100644
--- a/template/en/default/reports/report-table.html.tmpl
+++ b/template/en/default/reports/report-table.html.tmpl
@@ -37,7 +37,8 @@
 [% row_field_disp = field_descs.$row_field || row_field %]
   
 [% IF tbl == "-total-" %]
-  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %][% END %]
+  [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]
+  [% "&$tbl_vals" IF tbl_vals %][% END %]
 [% ELSE %]
   [% urlbase = BLOCK %]buglist.cgi?[% buglistbase %]&
   [% tbl_field FILTER url_quote %]=[% tbl FILTER url_quote %][% END %]
@@ -120,7 +121,8 @@
       [% END %] 
       <td class="ttotal" align="right">
         <a href="[% urlbase %]&amp;
-          [% row_field FILTER url_quote %]=[% row FILTER url_quote %]">
+          [% row_field FILTER url_quote %]=[% row FILTER url_quote %]
+          [% "&amp;$col_vals" IF col_vals %]">
         [% row_total %]</a>
         [% grand_total = grand_total + row_total %]
       </td>
@@ -137,14 +139,17 @@
       
       <td class="ttotal" align="center">
         <a href="[% urlbase %]&amp;
-          [% col_field FILTER url_quote %]=[% col FILTER url_quote %]">
+          [% col_field FILTER url_quote %]=[% col FILTER url_quote %]
+          [% "&amp;$row_vals" IF row_vals %]">
         [% col_totals.$col %]</a>
       <strong>
       </td> 
     [% END %]
     <td class="ttotal" align="right">
       <strong>
-        <a href="buglist.cgi?[% urlbase %]">[% grand_total %]</a>
+        <a href="[% urlbase %]
+          [% "&amp;$row_vals" IF row_vals %]
+          [% "&amp;$col_vals" IF col_vals %]">[% grand_total %]</a>
       </strong>
     </td>
   </tr>
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 %]