diff options
| author | mkanat%bugzilla.org <> | 2009-10-06 07:38:29 +0200 |
|---|---|---|
| committer | mkanat%bugzilla.org <> | 2009-10-06 07:38:29 +0200 |
| commit | 4671e0ffd9920d000fb6191999288ed12d4dac52 (patch) | |
| tree | a4592302ace3162d0482751a4019a1a31b65923e /template/en/default/bug | |
| parent | 6e282d384995d9c8067302a6cbaae04eaba308a5 (diff) | |
| download | bugzilla-4671e0ffd9920d000fb6191999288ed12d4dac52.tar.gz bugzilla-4671e0ffd9920d000fb6191999288ed12d4dac52.tar.xz | |
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
Diffstat (limited to 'template/en/default/bug')
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 22 | ||||
| -rw-r--r-- | template/en/default/bug/knob.html.tmpl | 7 |
2 files changed, 9 insertions, 20 deletions
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 %] |