Bug 173005 - Add bar charts, pie charts etc. to reporting. Patch by gerv; 2xr=joel.

1 files changed, 8 insertions, 35 deletions

diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl
index 73d542124..a26553602 100644
--- a/template/en/default/search/search-report-table.html.tmpl
+++ b/template/en/default/search/search-report-table.html.tmpl
@@ -29,12 +29,12 @@
   onload = "selectProduct(document.forms['reportform']);"
 %]
 
-[% PROCESS "global/field-descs.html.tmpl" %]
+[% PROCESS "search/search-report-select.html.tmpl" %]
 
 <p>
-  Produce a table of bug counts by choosing one or more fields to plot against
-  each other, and then refining your set of bugs using the rest of the form. If
-  you choose a third axis, it will be represented by multiple tables of data.
+  Produce a table of bug counts by choosing one or more fields as your axes, 
+  and then refining your set of bugs using the rest of the form. 
+  If you choose a third axis, it will be represented by multiple tables of data.
 </p>
 
 [% button_name = "Generate Report" %]
@@ -47,7 +47,7 @@
     </td>
     <td align="center">
       <b>Horizontal Axis:</b>
-      [% PROCESS select sel = { name => 'x_axis_field', noop = 1 } %]
+      [% PROCESS select name = 'x_axis_field' %]
     </td>
     <td>&nbsp;&nbsp;</td>
     <td rowspan="2">
@@ -60,14 +60,14 @@
   <tr>
     <td valign="middle" align="center">
       <b>Vertical Axis:</b><br>
-      [% PROCESS select sel = { name => 'y_axis_field' } %]
+      [% PROCESS select name = 'y_axis_field' %]
     </td>
     <td width="150px" height="150px">
       <table border="1" width="100%" height="100%">
         <tr>
           <td align="center" valign="middle">
             <b>Multiple Tables:</b><br>
-            [% PROCESS select sel = { name => 'z_axis_field', noop = 1 } %]
+            [% PROCESS select name = 'z_axis_field' %]
           </td>
         </tr>
       </table>
@@ -82,7 +82,7 @@
 <br>
 <input type="submit" value="[% button_name %]">
 <input type="hidden" name="format" value="table">
-<input type="hidden" name="action" value="plot">
+<input type="hidden" name="action" value="wrap">
 <hr>
 
 [% PROCESS "search/boolean-charts.html.tmpl" %]
@@ -90,30 +90,3 @@
 </form>
 
 [% PROCESS global/footer.html.tmpl %]
-
-[%############################################################################%]
-[%# Block for SELECT fields                                                  #%]
-[%############################################################################%]
-
-[% 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" ] %]
-
-  <select name="[% sel.name %]">
-    [% IF sel.noop %]
-      <option value="">&lt;none&gt;</option>
-    [% END %]
-    
-    [% FOREACH field = fields %]
-      [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %]
-      [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %]
-      [% NEXT IF field == "votes" AND !Param('usevotes') %]
-      
-      <option value="[% field FILTER html %]" 
-        [% " selected" IF default.${sel.name}.0 == field %]>
-        [% field_descs.$field || field FILTER html %]</option>
-    [% END %]
-  </select>
-[% END %]