Bug 695514: Slow performance in field-events.js.tmpl on show_bug.cgi with large numbe...

r=dkl a=LpSolit

diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 3fdf564726fa55f3469c815be8b9b8e0f2f91424..f3dd680dfb33e3af3e89bc78e7f443925daa28aa 100644 (file)
--- 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 94dd298f5693b97b27660d31811531c90e2609ed..13ec18d38cb4873a8a74cd37e1b2af456401887b 100644 (file)
--- 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 9c956ea9110ddfe31227c1d5e839367e33258b90..681ea716d1b6a4a09268dc270a84bc86a35ab32c 100644 (file)
--- 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>