diff options
| author | Frédéric Buclin <LpSolit@gmail.com> | 2015-08-26 23:29:51 +0200 |
|---|---|---|
| committer | Frédéric Buclin <LpSolit@gmail.com> | 2015-08-26 23:29:51 +0200 |
| commit | 246c04a3b156d5c9c2c4fedd9ba55c2037b66586 (patch) | |
| tree | 12115dca8e26c27f96f72516d777097083ab84f1 /template/en | |
| parent | 7a997794eb6d39027d2e8704773017793d8e51b9 (diff) | |
| download | bugzilla-246c04a3b156d5c9c2c4fedd9ba55c2037b66586.tar.gz bugzilla-246c04a3b156d5c9c2c4fedd9ba55c2037b66586.tar.xz | |
Bug 1196969: Custom fields whose visibility depend on the product are not displayed/hidden correctly
r=gerv a=sgreen
Diffstat (limited to 'template/en')
| -rw-r--r-- | template/en/default/bug/edit.html.tmpl | 20 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index f21e840ba..7f2b741f6 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -230,20 +230,12 @@ [%# PRODUCT #%] [%#############%] <tr id="field_tablerow_product"> - [% INCLUDE "bug/field-label.html.tmpl" - field = bug_fields.product - desc_url = 'describecomponents.cgi' - value = bug.product - %] - <td class="field_value" id="field_container_product"> - [% INCLUDE "global/product-select.html.tmpl" - id => "product" - name => "product" - value => bug.product - products => bug.choices.product - isselect => bug.check_can_change_field('product', 0, 1) - %] - </td> + [% INCLUDE bug/field.html.tmpl + bug = bug, field = bug_fields.product, value = bug.product + override_legal_values = bug.choices.product + desc_url = "describecomponents.cgi" + editable = bug.check_can_change_field('product', 0, 1) + %] </tr> [%# Classification is here so that it can be used in value controllers diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 85f7aea33..4d6019d01 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -91,6 +91,12 @@ </script> [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT constants.FIELD_TYPE_MULTI_SELECT ] %] + [%# The 'product' field needs its own template if classifications are enabled. %] + [% IF field.name == "product" AND Param('useclassification') %] + [% INCLUDE "global/product-select.html.tmpl" + id = "product", name = "product", value = value + products = override_legal_values %] + [% ELSE %] <input type="hidden" id="[% field.name FILTER html %]_dirty"> <select id="[% field.name FILTER html %]" name="[% field.name FILTER html %]" @@ -141,22 +147,24 @@ [% IF field.type == constants.FIELD_TYPE_MULTI_SELECT %] <input type="hidden" name="defined_[% field.name FILTER html %]"> [% END %] + [% END %] - <script type="text/javascript"> + <script type="text/javascript"> <!-- initHidingOptionsForIE('[% field.name FILTER js %]'); [%+ INCLUDE "bug/field-events.js.tmpl" field = field, product = bug.product_obj %] //--> - </script> + </script> - [% CASE constants.FIELD_TYPE_TEXTAREA %] + [% CASE constants.FIELD_TYPE_TEXTAREA %] <div id="[% field.name FILTER html %]_edit_container" class="bz_default_hidden"> <div> (<a href="#" id="[% field.name FILTER html %]_edit_action">edit</a>) </div> [% IF value %] - <pre class="field_textarea_readonly">[% value FILTER html %]</pre> + <pre id="[% field.name FILTER html %]_readonly" + class="field_textarea_readonly">[% value FILTER html %]</pre> [% END %] </div> <div id="[% field.name FILTER html %]_input"> @@ -173,7 +181,7 @@ '', true); </script> - [% CASE constants.FIELD_TYPE_BUG_URLS %] + [% CASE constants.FIELD_TYPE_BUG_URLS %] [% IF bug.id && value.size %] <ul class="bug_urls"> [% FOREACH bug_url = value %] |