Permalink
Browse files

Fixed that pagination_helper would ignore :params #947 [Sebastian Kan…

…thak]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1017 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent d3e1e03 commit ad6798f965d74568bf0722f595dcb84bc3e82b0b @dhh dhh committed Mar 27, 2005
Showing with 5 additions and 3 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +3 −3 actionpack/lib/action_view/helpers/pagination_helper.rb
View
@@ -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]
@@ -45,7 +45,7 @@ def pagination_links(paginator, options={})
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 @@ def pagination_links(paginator, options={})
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

0 comments on commit ad6798f

Please sign in to comment.