From 25ea0f34a60c3ae59ee4c123865c96213365cca5 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 1 Apr 2011 14:50:18 +0000 Subject: [PATCH] Keep filter params in 'Per page' links. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5278 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index df3104b5d..25c71aefe 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -360,14 +360,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