summaryrefslogtreecommitdiffstats
path: root/app/helpers/sort_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 16:58:43 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-07-10 16:58:43 +0000
commitfc6ee694907864eb3b98ae80ffdf3397b06322e8 (patch)
tree60f5d39c50ac11e4db27c7d83194c74b844ecd6a /app/helpers/sort_helper.rb
parent5d31eb2495c2c2cce3ab83867f0d2d01e5d1693c (diff)
downloadredmine-fc6ee694907864eb3b98ae80ffdf3397b06322e8.tar.gz
redmine-fc6ee694907864eb3b98ae80ffdf3397b06322e8.zip
Don't generate sort links with params.
git-svn-id: http://svn.redmine.org/redmine/trunk@15628 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/sort_helper.rb')
-rw-r--r--app/helpers/sort_helper.rb7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index 8c17f115d..8fb13818f 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -218,12 +218,7 @@ module SortHelper
caption = column.to_s.humanize unless caption
sort_options = { :sort => @sort_criteria.add(column.to_s, order).to_param }
- 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)
-
- link_to(caption, url_options, :class => css)
+ link_to(caption, {:params => request.query_parameters.merge(sort_options)}, :class => css)
end
# Returns a table header <th> tag with a sort link for the named column