From a43231dd4ccef2b02fa0434217b637a6d1638c97 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Fri, 3 Oct 2008 06:40:15 +0000
Subject: Bug 456922: Now that Bugzilla::Field::Choice is complete, clean up
 editvalues.cgi and error messages Patch By Max Kanat-Alexander
 <mkanat@bugzilla.org> r=bbaetz, a=mkanat

---
 .../en/default/admin/fieldvalues/edit.html.tmpl    | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'template/en/default/admin/fieldvalues/edit.html.tmpl')

diff --git a/template/en/default/admin/fieldvalues/edit.html.tmpl b/template/en/default/admin/fieldvalues/edit.html.tmpl
index 98b480ba8..29f881ec8 100644
--- a/template/en/default/admin/fieldvalues/edit.html.tmpl
+++ b/template/en/default/admin/fieldvalues/edit.html.tmpl
@@ -14,16 +14,15 @@
   #%]
 
 [%# INTERFACE:
-  # value: string; The field value we are editing.
-  # sortkey: number; Sortkey of the field value we are editing.
-  # field: object; The field this value belongs to.
+  # value: Bugzilla::Field::Choice; The field value we are editing.
+  # field: Bugzilla::Field; The field this value belongs to.
   #%]
 
 [% PROCESS global/variables.none.tmpl %]
 
 [% title = BLOCK %]
-  Edit Value '[% value FILTER html %]' for the '[% field.description FILTER html %]'
-  ([% field.name FILTER html %]) field
+  Edit Value '[% value.name FILTER html %]' for the 
+  '[% field.description FILTER html %]' ([% field.name FILTER html %]) field
 [% END %]
 [% PROCESS global/header.html.tmpl
   title = title
@@ -33,32 +32,33 @@
   <table border="0" cellpadding="4" cellspacing="0">
 
     <tr>
-      <th valign="top"><label for="value">Field Value:</label></th>
+      <th valign="top"><label for="value_new">Field Value:</label></th>
       <td>
-        [% IF is_static %]
-          <input type="hidden" name="value" value="[% value FILTER html %]">
-          [% value FILTER html %]
+        [% IF value.is_static %]
+          <input type="hidden" name="value_new" id="value_new"
+                 value="[% value.name FILTER html %]">
+            [%- value.name FILTER html %]
         [% ELSE %]
-          <input id="value" size="20" maxlength="60" name="value" value="
-          [%- value FILTER html %]">
+          <input id="value_new" name="value_new" size="20"
+                 maxlength="[% constants.MAX_FIELD_VALUE_SIZE %]"
+                 value="[% value.name FILTER html %]">
         [% END %]
       </td>
     </tr>
     <tr>
       <th align="right"><label for="sortkey">Sortkey:</label></th>
-      <td><input id="sortkey" size="20" maxlength="20" name="sortkey" value="
-      [%- sortkey FILTER html %]"></td>
+      <td><input id="sortkey" size="6" maxlength="6" name="sortkey" 
+                 value="[%- value.sortkey FILTER html %]"></td>
     </tr>
     [% IF field.name == "bug_status" %]
       <tr>
         <th align="right"><label for="is_open">Status Type:</label></th>
-        <td>[% IF is_open %]Open[% ELSE %]Closed[% END %]</td>
+        <td>[% IF value.is_open %]Open[% ELSE %]Closed[% END %]</td>
       </tr>
     [% END %]
   </table>
 
-  <input type="hidden" name="valueold" value="[% value FILTER html %]">
-  <input type="hidden" name="sortkeyold" value="[% sortkey FILTER html %]">
+  <input type="hidden" name="value" value="[% value.name FILTER html %]">
   <input type="hidden" name="action" value="update">
   <input type="hidden" name="field" value="[% field.name FILTER html %]">
   <input type="hidden" name="token" value="[% token FILTER html %]">
-- 
cgit v1.2.3-24-g4f1b