From 4ab6c90fff265849d9284b5d4f9aca93da231edd Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 24 Sep 2008 07:55:05 +0000
Subject: Bug 357904: Create an object for a Field Value and have
 Bugzilla::Field->legal_values use it Patch By Max Kanat-Alexander
 <mkanat@bugzilla.org> r=bbaetz, a=mkanat

---
 template/en/default/bug/field.html.tmpl | 7 ++++---
 template/en/default/config.js.tmpl      | 2 +-
 template/en/default/config.rdf.tmpl     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl
index 39f69cfd2..762e659db 100644
--- a/template/en/default/bug/field.html.tmpl
+++ b/template/en/default/bug/field.html.tmpl
@@ -100,9 +100,10 @@
             </option>
           [% END %]
           [% FOREACH legal_value = field.legal_values %]
-            <option value="[% legal_value FILTER html %]"
-                [%- " selected=\"selected\"" IF value.contains(legal_value).size %]>
-                [%- legal_value FILTER html %]</option>
+            <option value="[% legal_value.name FILTER html %]"
+                [%- " selected=\"selected\"" 
+                    IF value.contains(legal_value.name).size %]>
+                [%- legal_value.name FILTER html %]</option>
           [% END %]
         </select>
         [%# When you pass an empty multi-select in the web interface,
diff --git a/template/en/default/config.js.tmpl b/template/en/default/config.js.tmpl
index 66617007d..0d6358312 100644
--- a/template/en/default/config.js.tmpl
+++ b/template/en/default/config.js.tmpl
@@ -61,7 +61,7 @@ var severity      = [ [% FOREACH x = severity %]'[% x FILTER js %]', [% END %] ]
 // =============
 
 [% FOREACH cf = custom_fields %]
-var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x FILTER js %]', [% END %] ];
+var [% cf.name FILTER js %] = [ [% FOREACH x = cf.legal_values %]'[% x.name FILTER js %]', [% END %] ];
 [% END %]
 
 
diff --git a/template/en/default/config.rdf.tmpl b/template/en/default/config.rdf.tmpl
index 3c6f54969..ea400a2ae 100644
--- a/template/en/default/config.rdf.tmpl
+++ b/template/en/default/config.rdf.tmpl
@@ -107,7 +107,7 @@
   <bz:[% cf.name FILTER html %]>
     <Seq>
       [% FOREACH item = cf.legal_values %]
-        <li>[% item FILTER html %]</li>
+        <li>[% item.name FILTER html %]</li>
       [% END %]
     </Seq>
   </bz:[% cf.name FILTER html %]>
-- 
cgit v1.2.3-24-g4f1b