diff options
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/bug/field-events.js.tmpl | 12 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 3 |
3 files changed, 14 insertions, 3 deletions
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 3fdf56472..f3dd680df 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -251,7 +251,7 @@ TUI_hide_default('attachment_text_field'); <script type="text/javascript"> <!-- [%+ INCLUDE "bug/field-events.js.tmpl" - field = bug_fields.component %] + field = bug_fields.component, product = product %] //--> </script> </td> diff --git a/template/en/default/bug/field-events.js.tmpl b/template/en/default/bug/field-events.js.tmpl index 94dd298f5..13ec18d38 100644 --- a/template/en/default/bug/field-events.js.tmpl +++ b/template/en/default/bug/field-events.js.tmpl @@ -19,6 +19,8 @@ [%# INTERFACE: # field: a Bugzilla::Field object + # product: (optional) a Bugzilla::Product object. When specified, + # components are restricted to this product. #%] [% FOREACH controlled_field = field.controls_visibility_of %] @@ -29,7 +31,15 @@ [%- END %] ]); [% END %] -[% FOREACH legal_value = field.legal_values %] + +[% legal_values = [] %] +[% IF field.name == "component" AND product %] + [% legal_values = product.components %] +[% ELSE %] + [% legal_values = field.legal_values %] +[% END %] + +[% FOREACH legal_value = legal_values %] [% FOREACH controlled_field = legal_value.controlled_values.keys %] [% SET cont_ids = [] %] [% FOREACH val = legal_value.controlled_values.$controlled_field %] diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 9c956ea91..681ea716d 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -149,7 +149,8 @@ <script type="text/javascript"> <!-- initHidingOptionsForIE('[% field.name FILTER js %]'); - [%+ INCLUDE "bug/field-events.js.tmpl" field = field %] + [%+ INCLUDE "bug/field-events.js.tmpl" + field = field, product = bug.product_obj %] //--> </script> |