From ab199bf568703d0c287d0f21ce1816e44183aa02 Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Fri, 29 Jul 2005 21:14:40 +0000
Subject: Bug 286294: cleanup editclassifications.cgi and migrate the existent
 code to use Classification.pm - Patch by Tiago R. Mello <timello@gmail.com>
 r=LpSolit a=myk

---
 template/en/default/admin/classifications/edit.html.tmpl       |  1 -
 template/en/default/admin/classifications/reclassify.html.tmpl | 10 +++++-----
 template/en/default/admin/classifications/select.html.tmpl     | 10 ++++------
 3 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'template/en/default/admin/classifications')

diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl
index fba32ca30..65299df22 100644
--- a/template/en/default/admin/classifications/edit.html.tmpl
+++ b/template/en/default/admin/classifications/edit.html.tmpl
@@ -59,7 +59,6 @@
   </table>
 
   <input type=hidden name="classificationold" value="[% classification FILTER html %]">
-  <input type=hidden name="descriptionold" value="[% description 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 5d4cb73e4..3f7982bb3 100644
--- a/template/en/default/admin/classifications/reclassify.html.tmpl
+++ b/template/en/default/admin/classifications/reclassify.html.tmpl
@@ -51,9 +51,9 @@
       <td></td>
       <td valign="top">
       <select name="prodlist" id="prodlist" multiple="multiple" size="20">
-        [% FOREACH cl = class_products %]
-          <option value="[% cl.value FILTER html %]">
-             [% cl.name FILTER html %]
+        [% FOREACH product = unselected_products %]
+          <option value="[% product.name FILTER html %]">
+            [[% product.classification.name FILTER html %]]&nbsp;[% product.name FILTER html %]
           </option>
         [% END %]
       </select></td>
@@ -66,8 +66,8 @@
       <td valign="middle" rowspan=2>
         <select name="myprodlist" id="myprodlist" multiple="multiple" size="20">
           [% FOREACH product = selected_products %]
-            <option value="[% product FILTER html %]">
-              [% product FILTER html %]
+            <option value="[% product.name FILTER html %]">
+              [% product.name FILTER html %]
             </option>
           [% END %]
       </select></td>
diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl
index 3cfa3fcaa..60ae81216 100644
--- a/template/en/default/admin/classifications/select.html.tmpl
+++ b/template/en/default/admin/classifications/select.html.tmpl
@@ -23,8 +23,6 @@
   title = "Select classification"
 %]
 
-[% filt_classification = classification FILTER html %]
-
 <table border=1 cellpadding=4 cellspacing=0>
   <tr bgcolor="#6666ff">
     <th align="left">Edit Classification ...</th>
@@ -35,7 +33,7 @@
 
   [% FOREACH cl = classifications %]
     <tr>
-      <td valign="top"><a href="editclassifications.cgi?action=edit&amp;classification=[% cl.classification FILTER url_quote %]"><b>[% cl.classification FILTER html %]</b></a></td>
+      <td valign="top"><a href="editclassifications.cgi?action=edit&amp;classification=[% cl.name FILTER url_quote %]"><b>[% cl.name FILTER html %]</b></a></td>
       <td valign="top"> 
       [% IF cl.description %]
         [% cl.description %]
@@ -44,16 +42,16 @@
       [% END %]
       </td>
       [% IF (cl.id == 1) %]
-        <td valign="top">[% cl.total FILTER html %]</td>
+        <td valign="top">[% cl.product_count FILTER html %]</td>
       [% ELSE %]
-        <td valign="top"><a href="editclassifications.cgi?action=reclassify&amp;classification=[% cl.classification FILTER url_quote %]">reclassify ([% cl.total FILTER html %])</a></td>
+        <td valign="top"><a href="editclassifications.cgi?action=reclassify&amp;classification=[% cl.name FILTER url_quote %]">reclassify ([% cl.product_count FILTER html %])</a></td>
       [% END %]
 
       [%# don't allow user to delete the default id. %]
       [% IF (cl.id == 1) %]
         <td valign="top">&nbsp;</td>
       [% ELSE %]
-        <td valign="top"><a href="editclassifications.cgi?action=del&amp;classification=[% cl.classification FILTER url_quote %]">delete</a></td>
+        <td valign="top"><a href="editclassifications.cgi?action=del&amp;classification=[% cl.name FILTER url_quote %]">delete</a></td>
       [% END %]
     </tr>
   [% END %]
-- 
cgit v1.2.3-24-g4f1b