From 4671e0ffd9920d000fb6191999288ed12d4dac52 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Tue, 6 Oct 2009 05:38:29 +0000
Subject: Bug 512618: Make Bugzilla::Bug::choices return Field::Choice objects,
 not just values Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit,
 a=LpSolit

---
 template/en/default/bug/edit.html.tmpl | 22 ++++++----------------
 template/en/default/bug/knob.html.tmpl |  7 +++----
 2 files changed, 9 insertions(+), 20 deletions(-)

(limited to 'template/en/default')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index d8a7fa4d7..76ca259e5 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -375,16 +375,9 @@
     [%#############%]
     
     <tr>
-       [% IF bug.check_can_change_field('product', 0, 1) %]
-         [% prod_list = user.get_enterable_products %]
-         [% IF NOT user.can_enter_product(bug.product) %]
-           [% prod_list.unshift(bug.product_obj) %]
-         [% END %]
-       [% END %]
-
        [% INCLUDE bug/field.html.tmpl
             bug = bug, field = select_fields.product,
-            override_legal_values = prod_list
+            override_legal_values = bug.choices.product
             desc_url = 'describecomponents.cgi', value = bug.product
             editable = bug.check_can_change_field('product', 0, 1) %]
     </tr>
@@ -1112,24 +1105,21 @@
 [%############################################################################%]
 
 [% BLOCK select %]
-  [% IF NOT no_td %]
   <td>
-  [% END %]
-    [% IF bug.check_can_change_field(selname, 0, 1) AND bug.choices.${selname}.size > 1 %]
+    [% IF bug.check_can_change_field(selname, 0, 1) 
+          AND bug.choices.${selname}.size > 1 %]
       <select id="[% selname %]" name="[% selname %]">
         [% FOREACH x = bug.choices.${selname} %]
-          <option value="[% x FILTER html %]"
-            [% " selected" IF x == bug.${selname} %]>[% x FILTER html %]
+          <option value="[% x.name FILTER html %]"
+            [% " selected" IF x.name == bug.${selname} %]>
+            [%- x.name FILTER html %]
           </option>
         [% END %]
       </select>
     [% ELSE %]
       [% bug.${selname} FILTER html %]
     [% END %]
-  [% IF NOT no_td %]
   </td>
-  [% END %]
-  [% no_td = 0 %]
 [% END %]
 
 [%############################################################################%]
diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl
index cd586fceb..10d58e51b 100644
--- a/template/en/default/bug/knob.html.tmpl
+++ b/template/en/default/bug/knob.html.tmpl
@@ -147,10 +147,9 @@
 [% BLOCK select_resolution %]
   <select name="resolution" id="resolution">
     [% FOREACH r = bug.choices.resolution %]
-      [% NEXT IF r == "MOVED" && bug.resolution != "MOVED" %]
-      <option value="[% r FILTER html %]"
-      [% "selected" IF r == bug.resolution %]>
-        [% display_value("resolution", r) FILTER html %]</option>
+      <option value="[% r.name FILTER html %]"
+      [% ' selected="selected"' IF r.name == bug.resolution %]>
+        [% display_value("resolution", r.name) FILTER html %]</option>
     [% END %]
   </select>
 [% END %]
-- 
cgit v1.2.3-24-g4f1b