From: wicked%sci.fi <>
Date: Tue, 14 Jul 2009 04:01:27 +0000 (+0000)
Subject: Bug 448690: Changing columns after editing a saved search forgets edits - Patch by... 
X-Git-Tag: bugzilla-3.2.5~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=773280dc16779a68e52357f6ef2d7decf5caee85;p=thirdparty%2Fbugzilla.git

Bug 448690: Changing columns after editing a saved search forgets edits - Patch by Teemu Mannermaa <wicked@sci.fi> r/a=LpSolit
---

diff --git a/colchange.cgi b/colchange.cgi
index 5e84dcc2cb..108c3db6d2 100755
--- a/colchange.cgi
+++ b/colchange.cgi
@@ -142,14 +142,12 @@ if (defined $cgi->param('rememberedquery')) {
         $params->param('columnlist', join(",", @collist));
         $search->set_url($params->query_string());
         $search->update();
-        $vars->{'redirect_url'} = "buglist.cgi?".$cgi->param('rememberedquery');
-    }
-    else {
-        my $params = new Bugzilla::CGI($cgi->param('rememberedquery'));
-        $params->param('columnlist', join(",", @collist));
-        $vars->{'redirect_url'} = "buglist.cgi?".$params->query_string();
     }
 
+    my $params = new Bugzilla::CGI($cgi->param('rememberedquery'));
+    $params->param('columnlist', join(",", @collist));
+    $vars->{'redirect_url'} = "buglist.cgi?".$params->query_string();
+
 
     # If we're running on Microsoft IIS, using cgi->redirect discards
     # the Set-Cookie lines -- workaround is to use the old-fashioned 
@@ -169,7 +167,9 @@ if (defined $cgi->param('rememberedquery')) {
     exit;
 }
 
-if (defined $cgi->cookie('COLUMNLIST')) {
+if (defined $cgi->param('columnlist')) {
+    @collist = split(/[ ,]+/, $cgi->param('columnlist'));
+} elsif (defined $cgi->cookie('COLUMNLIST')) {
     @collist = split(/ /, $cgi->cookie('COLUMNLIST'));
 } else {
     @collist = DEFAULT_COLUMN_LIST;
@@ -188,13 +188,6 @@ if (defined $cgi->param('query_based_on')) {
     # Only allow users to edit their own queries.
     if ($search && $search->user->id == Bugzilla->user->id) {
         $vars->{'saved_search'} = $search;
-        $vars->{'buffer'} = "cmdtype=runnamed&namedcmd=". url_quote($search->name);
-
-        my $params = new Bugzilla::CGI($search->url);
-        if ($params->param('columnlist')) {
-            my @collist = split(',', $params->param('columnlist'));
-            $vars->{'collist'} = \@collist if scalar (@collist);
-        }
     }
 }
 
diff --git a/query.cgi b/query.cgi
index 5998c31abb..dde9449dc2 100755
--- a/query.cgi
+++ b/query.cgi
@@ -344,6 +344,7 @@ if (($cgi->param('query_format') || $cgi->param('format') || "")
 }
 
 $vars->{'known_name'} = $cgi->param('known_name');
+$vars->{'columnlist'} = $cgi->param('columnlist');
 
 
 # Add in the defaults.
diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl
index d0381e1a4f..17ff63a104 100644
--- a/template/en/default/search/knob.html.tmpl
+++ b/template/en/default/search/knob.html.tmpl
@@ -62,6 +62,10 @@
     [%# The name of the existing query will be passed to buglist.cgi. %]
     <input type="hidden" name="query_based_on" value="[% known_name FILTER html %]">
   [% END %]
+  [%# Preserve any custom column list that might be set. %]
+  [% IF columnlist %]
+    <input type="hidden" name="columnlist" value="[% columnlist FILTER html %]">
+  [% END %]
 </p>
 
 <p>