Keep issue filter params on sort headers.

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

Keep issue filter params on sort headers.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5303 e93f8b46-1217-0410-a6f0-8f06a7374b81
e78149f8 · Jean-Philippe Lang · Eric Davis · 13355489 · e78149f8
Commit e78149f8 authored Apr 03, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

sort_helper.rb app/helpers/sort_helper.rb +1 -2

No files found.
--- 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)