summaryrefslogtreecommitdiffstats
path: root/template/en
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2005-07-29 23:14:40 +0200
committerlpsolit%gmail.com <>2005-07-29 23:14:40 +0200
commitab199bf568703d0c287d0f21ce1816e44183aa02 (patch)
tree41e9ffb1230afed4f0bfff0d463a3e9e025c26e4 /template/en
parent966c262164d7dd68686862fa827d0dfde2132b69 (diff)
downloadbugzilla-ab199bf568703d0c287d0f21ce1816e44183aa02.tar.gz
bugzilla-ab199bf568703d0c287d0f21ce1816e44183aa02.tar.xz
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
Diffstat (limited to 'template/en')
-rw-r--r--template/en/default/admin/classifications/edit.html.tmpl1
-rw-r--r--template/en/default/admin/classifications/reclassify.html.tmpl10
-rw-r--r--template/en/default/admin/classifications/select.html.tmpl10
-rw-r--r--template/en/default/global/user-error.html.tmpl4
4 files changed, 9 insertions, 16 deletions
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 %]
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 6fd58ee66..59bbe1d87 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -248,10 +248,6 @@
must reassign those products to another classification before you
can delete this one.
- [% ELSIF error == "cant_delete_default_classification" %]
- Sorry, but you can not delete the default classification,
- '[% name FILTER html %]'.
-
[% ELSIF error == "component_already_exists" %]
[% title = "Component Already Exists" %]
A component with the name '[% name FILTER html %]' already exists.