Bug 514970: Clean up duplicates.cgi and make it use Bug objects

r=LpSolit, a=LpSolit

1 files changed, 36 insertions, 34 deletions

diff --git a/template/en/default/reports/duplicates.html.tmpl b/template/en/default/reports/duplicates.html.tmpl
index e4ea73882..6b49a23c6 100644
--- a/template/en/default/reports/duplicates.html.tmpl
+++ b/template/en/default/reports/duplicates.html.tmpl
@@ -19,14 +19,12 @@
   #%]
 
 [%# INTERFACE:
-  # products: an array of product objects this user can see.
-  #
   # sortby: string. the column on which we are sorting the buglist.
   # reverse: boolean. True if we are reversing the current sort.
   # maxrows: integer. Max number of rows to display.
   # changedsince: integer. The number of days ago for the changedsince column.
   # openonly: boolean. True if we are only showing open bugs.
-  # query_products: list of strings. The set of products we check for dups.
+  # product: array of strings. The set of products we check for dups.
   #
   # Additionally, you need to fulfill the interface to
   # duplicates-table.html.tmpl.
@@ -34,9 +32,10 @@
 
 [% PROCESS global/variables.none.tmpl %]
 
-[% IF query_products.size %]
+[% IF product.size %]
   [% title = BLOCK %]
-    Most Frequently Reported [% terms.Bugs %] for [% query_products.join(', ') FILTER html %]
+    Most Frequently Reported [% terms.Bugs %] for 
+    [%+ product.join(', ') FILTER html %]
   [% END %]
 [% ELSE %]
   [% title = "Most Frequently Reported $terms.Bugs" %]
@@ -44,7 +43,7 @@
 
 [% PROCESS global/header.html.tmpl
    title = title
-   style = ".resolved { background-color: #d9d9d9; color: #000000; }"
+   style_urls = ['skins/standard/duplicates.css']
 %]
 
 <p>
@@ -57,27 +56,26 @@
 
 [%# *** Parameters *** %]
 
-[% bug_ids_string = vis_bug_ids.join(',') %]
+[% bug_ids_string = bug_ids.join(',') %]
 
 <h3><a name="params">Change Parameters</a></h3>
 
 <form method="get" action="duplicates.cgi">
   <input type="hidden" name="sortby" value="[% sortby FILTER html %]">
-  <input type="hidden" name="reverse" value="[% reverse %]">
-  <input type="hidden" name="bug_id" value="[% bug_ids_string %]">
+  <input type="hidden" name="reverse" value="[% reverse FILTER html %]">
+  <input type="hidden" name="bug_id" value="[% bug_ids_string FILTER html %]">
   <table>
     <tr>
-      <td>When sorting or restricting,
-          work with:</td>
+      <td>When sorting or restricting, work with:</td>
       <td>
         <input type="radio" name="sortvisible" id="entirelist" value="0"
-          [%+ "checked" IF NOT sortvisible %]>
+          [% ' checked="checked"' IF NOT sortvisible %]>
         <label for="entirelist">
           entire list
         </label>
         <br>
         <input type="radio" name="sortvisible" id="visiblelist" value="1"
-          [%+ "checked" IF sortvisible %]>
+          [% ' checked="checked"' IF sortvisible %]>
         <label for="visiblelist">
           currently visible list
         </label>
@@ -85,9 +83,9 @@
       <td rowspan="4" valign="top">Restrict to products:</td>
       <td rowspan="4" valign="top">
         <select name="product" size="5" multiple="multiple">
-          [% FOREACH p = products %]
+          [% FOREACH p = user.get_selectable_products %]
             <option name="[% p.name FILTER html %]"
-            [% " selected" IF lsearch(query_products, p.name) != -1 %]
+            [% ' selected="selected"' IF product.contains(p.name) %]
             >[% p.name FILTER html %]</option>
           [% END %]
         </select>
@@ -95,16 +93,20 @@
      </tr>
 
     <tr>
-      <td>Max rows:</td>
+      <td><label for="maxrows">Max rows:</label></td>
       <td>
-        <input size="4" name="maxrows" value="[% maxrows %]">
+        <input size="4" name="maxrows" id="maxrows" 
+               value="[% maxrows FILTER html %]">
       </td>
     </tr>
 
     <tr>
-      <td>Change column is change in the last:</td>
       <td>
-        <input size="4" name="changedsince" value="[% changedsince %]"> days
+        <label for="changedsince">Change column is change in the last:</label>
+      </td>
+      <td>
+        <input size="4" name="changedsince" id="changedsince"
+               value="[% changedsince FILTER html %]"> days
       </td>
     </tr>
 
@@ -116,7 +118,7 @@
       </td>
       <td>
         <input type="checkbox" name="openonly" id="openonly" value="1"
-          [%+ "checked" IF openonly %]>
+          [% ' checked="checked"' IF openonly %]>
       </td>
     </tr>
 
@@ -126,10 +128,9 @@
 </form>
 
 <form method="post" action="buglist.cgi">
-  <input type="hidden" name="bug_id" value="[% bug_ids_string %]">
-  <input type="hidden" name="order" value="Reuse same sort as last time">
+  <input type="hidden" name="bug_id" value="[% bug_ids_string FILTER html %]">
   Or just give this to me as a <input type="submit" id="list" 
-                                value="[% terms.bug %] list">.
+                                      value="[% terms.bug %] list">.
   (Note: the order may not be the same.)
 </form>
 
@@ -139,15 +140,15 @@
   <a name="explanation">What are "Most Frequently Reported [% terms.Bugs %]"?</a>
 </b>
 
-<blockquote>
-  The Most Frequent [% terms.Bugs %] page lists the known open [% terms.bugs %] which
-  are reported most frequently. It is
-  automatically generated from the [% terms.Bugzilla %] database every 24 hours, by
+<p>
+  The Most Frequent [% terms.Bugs %] page lists the known open 
+  [%+ terms.bugs %] which are reported most frequently,
   counting the number of direct and indirect duplicates of [% terms.bugs %].
   This information is provided in order to assist in minimizing
-  the amount of duplicate [% terms.bugs %] entered into [% terms.Bugzilla %], which
-  saves time for Quality Assurance engineers who have to triage the [% terms.bugs %].
-</blockquote>
+  the amount of duplicate [% terms.bugs %] entered into [% terms.Bugzilla %],
+  which saves time for Quality Assurance engineers who have to triage
+  the [% terms.bugs %].
+</p>
 
 <b>How do I use this list?</b>
 
@@ -166,11 +167,12 @@
 
   <ul>
     <li><a href="query.cgi">Try and locate a similar [% terms.bug %]</a>
-        that has already been filed.</li>
+      that has already been filed.</li>
     <li>If you find your [% terms.bug %] in [% terms.Bugzilla %],
-        feel free to comment with any new or additional data you may have.</li>
-    <li>If you cannot find your problem already documented in [% terms.Bugzilla %],
-        <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li>
+      feel free to comment with any new or additional data you may have.</li>
+    <li>If you cannot find your problem already documented in 
+      [%+ terms.Bugzilla %],
+      <a href="enter_bug.cgi">file a new [% terms.bug %]</a>.</li>
   </ul>
 </ul>