Bug 306601: Bugzilla::Classification needs a products() method - Patch by André Batosti <batosti@async.com.br> r=LpSolit a=justdave

4 files changed, 34 insertions, 24 deletions

diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl
index 1430e093d..c32e46b4d 100644
--- a/template/en/default/admin/classifications/del.html.tmpl
+++ b/template/en/default/admin/classifications/del.html.tmpl
@@ -30,13 +30,13 @@
 
 </tr><tr>
   <td valign="top">Classification:</td>
-  <td valign="top">[% classification FILTER html %]</td>
+  <td valign="top">[% classification.name FILTER html %]</td>
 
 </tr><tr>
   <td valign="top">Description:</td>
   <td valign="top">
-    [% IF description %]
-      [% description %]
+    [% IF classification.description %]
+      [% classification.description FILTER none %]
     [% ELSE %]
       <font color="red">description missing</font>
     [% END %]
@@ -51,7 +51,7 @@
 <form method=post action="editclassifications.cgi">
   <input type=submit value="Yes, delete">
   <input type=hidden name="action" value="delete">
-  <input type=hidden name="classification" value="[% classification FILTER html %]">
+  <input type=hidden name="classification" value="[% classification.name FILTER html %]">
 </form>
 
 <p>Back to the <a href="./">main [% terms.bugs %] page</a>
diff --git a/template/en/default/admin/classifications/delete.html.tmpl b/template/en/default/admin/classifications/delete.html.tmpl
index b2ec26cbb..046c1469f 100644
--- a/template/en/default/admin/classifications/delete.html.tmpl
+++ b/template/en/default/admin/classifications/delete.html.tmpl
@@ -23,7 +23,7 @@
   title = "Classification deleted"
 %]
 
-Classification [% classification FILTER html %] deleted.<br>
+Classification [% classification.name FILTER html %] deleted.<br>
 
 <p>Back to the <a href="./">main [% terms.bugs %] page</a>
 or <a href="editclassifications.cgi"> edit</a> more classifications.
diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index 65299df22..b38f4d6aa 100644
--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -27,18 +27,24 @@
   <table  border=0 cellpadding=4 cellspacing=0>
     <tr>
       <th align="right">Classification:</th>
-      <td><input size=64 maxlength=64 name="classification" value="[% classification FILTER html %]"></TD>
+      <td><input size=64 maxlength=64 name="classification" 
+                 value="[% classification.name FILTER html %]"></td>
     </tr>
     <tr>
       <th align="right">Description:</th>
-      <td><textarea rows=4 cols=64 name="description">[% description %]</textarea></TD>
+      <td><textarea rows=4 cols=64 name="description">
+            [% classification.description FILTER none %]</textarea>
+      </td>
     </tr>
     <tr valign=top>
-      <th align="right"><a href="editproducts.cgi?classification=[% classification FILTER url_quote %]">Edit products</a></th>
+      <th align="right">
+        <a href="editproducts.cgi?classification=[% classification.name FILTER url_quote %]">
+        Edit products</a>
+      </th>
       <td>
-        [% IF products AND products.size > 0 %]
+        [% IF classification.products.size > 0 %]
           <table>
-            [% FOREACH product = products %]
+            [% FOREACH product = classification.products %]
               <tr>
                 <th align=right valign=top>[% product.name FILTER html %]</th>
                 <td valign=top>
@@ -58,7 +64,8 @@
     </tr>
   </table>
 
-  <input type=hidden name="classificationold" value="[% classification FILTER html %]">
+  <input type=hidden name="classificationold" 
+         value="[% classification.name FILTER html %]">
   <input type=hidden name="action" value="update">
   <input type=submit value="Update">
 </form>
diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl
index 3f7982bb3..127aeea87 100644
--- a/template/en/default/admin/classifications/reclassify.html.tmpl
+++ b/template/en/default/admin/classifications/reclassify.html.tmpl
@@ -23,19 +23,17 @@
   title = "Reclassify products"
 %]
 
-[% main_classification = classification %]
-
 <form method=post action="editclassifications.cgi">
   <table border=0 cellpadding=4 cellspacing=0>
     <tr>
       <td valign="top">Classification:</td>
-      <td valign="top" colspan=3>[% main_classification FILTER html %]</td>
+      <td valign="top" colspan=3>[% classification.name FILTER html %]</td>
 
     </tr><tr>
       <td valign="top">Description:</td>
       <td valign="top" colspan=3>
-        [% IF description %]
-          [% description %]
+        [% IF classification.description %]
+          [% classification.description FILTER none %]
         [% ELSE %]
           <font color="red">description missing</font>
         [% END %]
@@ -45,16 +43,20 @@
       <td valign="top">Products:</td>
       <td valign="top">Products</td>
       <td></td>
-      <td valign="top">[% main_classification FILTER html %] Products</td>
+      <td valign="top">[% classification.name FILTER html %] Products</td>
 
     </tr><tr>
       <td></td>
       <td valign="top">
       <select name="prodlist" id="prodlist" multiple="multiple" size="20">
-        [% FOREACH product = unselected_products %]
-          <option value="[% product.name FILTER html %]">
-            [[% product.classification.name FILTER html %]]&nbsp;[% product.name FILTER html %]
-          </option>
+        [% FOREACH class = classifications %]
+          [% IF class.id != classification.id %]
+            [% FOREACH product = class.products %]
+              <option value="[% product.name FILTER html %]">
+                [[% class.name FILTER html %]]&nbsp;[% product.name FILTER html %]
+              </option>
+            [% END %]
+          [% END %]
         [% END %]
       </select></td>
 
@@ -65,7 +67,7 @@
 
       <td valign="middle" rowspan=2>
         <select name="myprodlist" id="myprodlist" multiple="multiple" size="20">
-          [% FOREACH product = selected_products %]
+          [% FOREACH product = classification.products %]
             <option value="[% product.name FILTER html %]">
               [% product.name FILTER html %]
             </option>
@@ -75,10 +77,11 @@
   </table>
 
   <input type=hidden name="action" value="reclassify">
-  <input type=hidden name="classification" value="[% main_classification FILTER html %]">
+  <input type=hidden name="classification" value="[% classification.name FILTER html %]">
 </form>
 
 <p>Back to the <a href="./">main [% terms.bugs %] page</a>,
 or <a href="editclassifications.cgi"> edit</a> more classifications.
 
-[% PROCESS global/footer.html.tmpl %] 
+[% PROCESS global/footer.html.tmpl %]
+