From ad6798f965d74568bf0722f595dcb84bc3e82b0b Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 27 Mar 2005 00:04:07 +0000 Subject: [PATCH] Fixed that pagination_helper would ignore :params #947 [Sebastian Kanthak] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1017 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/CHANGELOG | 2 ++ actionpack/lib/action_view/helpers/pagination_helper.rb | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index c5f42e51be..49d26b87a4 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed that pagination_helper would ignore :params #947 [Sebastian Kanthak] + * Added :owerwrite_params back to url_for and friends -- it was AWL since the introduction of Routes #921 [raphinou] * Added :position option to link_to_remote/form_remote_tag that can be either :before, :top, :bottom, or :after and specifies where the return from the method should be inserted #952 [Matthew McCray/Sam Stephenson] diff --git a/actionpack/lib/action_view/helpers/pagination_helper.rb b/actionpack/lib/action_view/helpers/pagination_helper.rb index 06feb274fb..1e8c80a032 100644 --- a/actionpack/lib/action_view/helpers/pagination_helper.rb +++ b/actionpack/lib/action_view/helpers/pagination_helper.rb @@ -45,7 +45,7 @@ module ActionView returning html = '' do if options[:always_show_anchors] and not window_pages[0].first? - html << link_to(first.number, options[:name] => first) + html << link_to(first.number, { options[:name] => first }.update( options[:params] )) html << ' ... ' if window_pages[0].number - first.number > 1 html << ' ' end @@ -54,14 +54,14 @@ module ActionView if paginator.current == page && !options[:link_to_current_page] html << page.number.to_s else - html << link_to(page.number, options[:name] => page) + html << link_to(page.number, { options[:name] => page }.update( options[:params] )) end html << ' ' end if options[:always_show_anchors] && !window_pages.last.last? html << ' ... ' if last.number - window_pages[-1].number > 1 - html << link_to(paginator.last.number, options[:name] => last) + html << link_to(paginator.last.number, { options[:name] => last }.update( options[:params])) end end end