kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed that pagination_helper would ignore :params #947 [Sebastian Kanthak]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1017 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-03-27 00:04:07 +00:00
parent d3e1e03056
commit ad6798f965
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
actionpack/CHANGELOG
View file

@ -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]

6
actionpack/lib/action_view/helpers/pagination_helper.rb
View file

@ -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