diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-27 00:04:07 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-27 00:04:07 +0000 |
commit | ad6798f965d74568bf0722f595dcb84bc3e82b0b (patch) | |
tree | 83afe88e3faca4f30422ce907cb815af9dcf54d0 /actionpack/lib/action_view/helpers | |
parent | d3e1e0305645b9de904399144b18b5d2bdf86e32 (diff) | |
download | rails-ad6798f965d74568bf0722f595dcb84bc3e82b0b.tar.gz rails-ad6798f965d74568bf0722f595dcb84bc3e82b0b.tar.bz2 rails-ad6798f965d74568bf0722f595dcb84bc3e82b0b.zip |
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
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/pagination_helper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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 |