Bug 524675: "Edit Search" fails to preserve comment, URL, and whiteboard params - Patch by Frédéric Buclin <LpSolit@gmail.com> r=ghendricks a=LpSolit

3 files changed, 5 insertions, 4 deletions

diff --git a/query.cgi b/query.cgi
index ab07fbf0f..d07773bde 100755
--- a/query.cgi
+++ b/query.cgi
@@ -128,7 +128,7 @@ sub PrefillForm {
                       "emailassigned_to", "emailcc", "emailqa_contact",
                       "emaillongdesc", "content",
                       "changedin", "votes", "short_desc", "short_desc_type",
-                      "long_desc", "long_desc_type", "bug_file_loc",
+                      "longdesc", "longdesc_type", "bug_file_loc",
                       "bug_file_loc_type", "status_whiteboard",
                       "status_whiteboard_type", "bug_id",
                       "bugidtype", "keywords", "keywords_type",
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index c6b3c3b30..c7990fd24 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -273,8 +273,9 @@ function doOnSelectProduct(selectmode) {
         <label for="[% field.name %]" accesskey="[% field.accesskey %]">[% field.description %]</label>:
       </th>
       <td>
+        [% type = field.name _ "_type" %]
         [% INCLUDE "search/type-select.html.tmpl"
-           name = field.name _ "_type",
+           name = type,
            types = query_types, selected = default.$type.0 %]
       </td>
       <td><input name="[% field.name %]" id="[% field.name %]" size="40"
diff --git a/template/en/default/search/search-help.html.tmpl b/template/en/default/search/search-help.html.tmpl
index a087927d2..12e82ba5e 100644
--- a/template/en/default/search/search-help.html.tmpl
+++ b/template/en/default/search/search-help.html.tmpl
@@ -41,10 +41,10 @@
 { id => "target_milestone", 
   html => "The target_milestone field is used to define when the engineer<br>
            the $terms.bug is assigned to expects to fix it." },   
-{ id => "long_desc", 
+{ id => "longdesc",
   html => "$terms.Bugs have comments added to them by $terms.Bugzilla users.  
            You can<br>search for some text in those comments." },   
-{ id => "long_desc_type", 
+{ id => "longdesc_type",
   html => "The type of comment search you would like" },   
 { id => "bug_file_loc", 
   html => "$terms.Bugs can have a URL associated with them - for example, a