From 88c0ad4221cdc1eed917fa6bea612d53afbf1727 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 25 Feb 2012 15:08:23 +0100
Subject: Bug 730552: HTML markup validation: unescaped "&" in CSV link on
 buglist.cgi r=timello a=LpSolit

---
 template/en/default/list/list.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template/en/default')

diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index 27d1eb027..4eeff5e64 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -202,7 +202,7 @@
       
       <td valign="middle" class="bz_query_links">
         <a href="buglist.cgi?
-        [% urlquerypart FILTER html %]&amp;ctype=csv&human=1">CSV</a> |
+        [% urlquerypart FILTER html %]&amp;ctype=csv&amp;human=1">CSV</a> |
         <a href="buglist.cgi?
         [% urlquerypart FILTER html %]&amp;title=
         [%- title FILTER html %]&amp;ctype=atom">Feed</a> |
-- 
cgit v1.2.3-24-g4f1b


From d9a166a767592ea2f2647f9fca3e43d21f0cd4aa Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 28 Feb 2012 23:28:17 +0100
Subject: Bug 695514: Slow performance in field-events.js.tmpl on show_bug.cgi
 with large number of products r=dkl a=LpSolit

---
 template/en/default/bug/create/create.html.tmpl |  2 +-
 template/en/default/bug/field-events.js.tmpl    | 12 +++++++++++-
 template/en/default/bug/field.html.tmpl         |  3 ++-
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'template/en/default')

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>
 
-- 
cgit v1.2.3-24-g4f1b