From 393dd151c6138b53c2f3ecaa21f2667ab827061d Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 12 Sep 2011 02:51:55 +0200
Subject: Bug 686246: When editing the inclusion and exclusion lists of a
 flagtype, empty grant and request groups are replaced by "" instead of "(no
 group)" in the drop-down menu a=LpSolit

---
 template/en/default/admin/flag-type/edit.html.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template/en')

diff --git a/template/en/default/admin/flag-type/edit.html.tmpl b/template/en/default/admin/flag-type/edit.html.tmpl
index f44c44d9d..2cb985a47 100644
--- a/template/en/default/admin/flag-type/edit.html.tmpl
+++ b/template/en/default/admin/flag-type/edit.html.tmpl
@@ -262,7 +262,7 @@
         [%- group.name FILTER html ~%]
       </option>
     [% END %]
-    [% IF !group_found && type.${selname} %]
+    [% IF !group_found && type.${selname}.name %]
       <option value="[% type.${selname}.name FILTER html %]" selected="selected">
         [%- type.${selname}.name FILTER html ~%]
       </option>
-- 
cgit v1.2.3-24-g4f1b


From 6fa9b5eafed50fe693238c83a04797e2042e27cb Mon Sep 17 00:00:00 2001
From: Tiago Mello <timello@gmail.com>
Date: Mon, 12 Sep 2011 23:47:52 -0300
Subject: Bug 685316: Change Simple Search template to use field_descs for
 Status Product. r/a=mkanat

---
 template/en/default/search/search-specific.html.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl
index 1d7229cf7..31d950ec5 100644
--- a/template/en/default/search/search-specific.html.tmpl
+++ b/template/en/default/search/search-specific.html.tmpl
@@ -46,7 +46,7 @@ for "crash secure SSL flash".
 <table summary="Search fields" class="bz_simple_search_form">
   <tr>
     <th>
-      <label for="bug_status">Status:</label>
+      <label for="bug_status">[% field_descs.bug_status FILTER html %]:</label>
     </th>
     <td>
       <select name="bug_status" id="bug_status">
@@ -64,7 +64,7 @@ for "crash secure SSL flash".
   </tr>
   <tr>
     <th>
-      <label for="product">Product:</label>
+      <label for="product">[% field_descs.product FILTER html %]:</label>
     </th>
     <td>
       <select name="product" id="product">
-- 
cgit v1.2.3-24-g4f1b


From f517974618ba835014e9d2a3565109af469f5d34 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Thu, 29 Sep 2011 01:27:24 +0200
Subject: Bug 686786: Decreasing votestoconfirm in editproducts.cgi crashes
 Bugzilla r/a=mkanat

---
 template/en/default/admin/products/groupcontrol/updated.html.tmpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/admin/products/groupcontrol/updated.html.tmpl b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
index 2f59cae68..353ce5c75 100644
--- a/template/en/default/admin/products/groupcontrol/updated.html.tmpl
+++ b/template/en/default/admin/products/groupcontrol/updated.html.tmpl
@@ -27,16 +27,16 @@
   title = title
 %]
 <p>
-[% IF changes.group_controls.now_na.size %]
-  [% FOREACH g = changes.group_controls.now_na %]
+[% IF changes._group_controls.now_na.size %]
+  [% FOREACH g = changes._group_controls.now_na %]
     Removing [% terms.bugs %] from group '[% g.name FILTER html %]' which
     no longer applies to this product<p>
     [% g.bug_count FILTER html %] [%+ terms.bugs %] removed<p>
   [% END %]
 [% END %]
 
-[% IF changes.group_controls.now_mandatory.size %]
-  [% FOREACH g = changes.group_controls.now_mandatory %]
+[% IF changes._group_controls.now_mandatory.size %]
+  [% FOREACH g = changes._group_controls.now_mandatory %]
     Adding [% terms.bugs %] to group '[% g.name FILTER html %]' which is 
     mandatory for this product<p>
     [% g.bug_count FILTER html %] [%+ terms.bugs %] added<p>
-- 
cgit v1.2.3-24-g4f1b