From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Apr 2011 14:09:22 +0000 (+0000)
Subject: Keep issue filter params on sort headers.
X-Git-Tag: 1.2.0~544
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=87bcb215630263f7ccb6480d2a44cf8901ea84d5;p=redmine.git

Keep issue filter params on sort headers.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index 2dc245348..a1808a056 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -200,8 +200,7 @@ module SortHelper
     caption = column.to_s.humanize unless caption
     
     sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param }
-    # don't reuse params if filters are present
-    url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
+    url_options = params.merge(sort_options)
     
      # Add project_id to url_options
     url_options = url_options.merge(:project_id => params[:project_id]) if params.has_key?(:project_id)