Keep filter params in 'Per page' links.

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

Keep filter params in 'Per page' links.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81
4e6962e7 · Jean-Philippe Lang · Eric Davis · 561fc8b0 · 4e6962e7
Commit 4e6962e7 authored Apr 01, 2011 by Jean-Philippe Lang Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

application_helper.rb app/helpers/application_helper.rb +2 -5

No files found.
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -362,14 +362,11 @@ module ApplicationHelper
  end
  
  def per_page_links(selected=nil)
-    url_param = params.dup
-    url_param.clear if url_param.has_key?(:set_filter)
-
    links = Setting.per_page_options_array.collect do |n|
      n == selected ? n : link_to_remote(n, {:update => "content",
-                                             :url => params.dup.merge(:per_page => n),
+                                             :url => params.merge(:per_page => n),
                                             :method => :get},
-                                            {:href => url_for(url_param.merge(:per_page => n))})
+                                            {:href => url_for(params.merge(:per_page => n))})
    end
    links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
  end