diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dc07a8f9..abf5e03d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -77,18 +77,18 @@ module ApplicationHelper def pagination_links_full(paginator, options={}, html_options={}) html = '' html << link_to_remote(('« ' + l(:label_previous)), - {:update => "content", :url => { :page => paginator.current.previous }}, - {:href => url_for(:action => 'list', :params =>{:page => paginator.current.previous})}) + ' ' if paginator.current.previous + {:update => "content", :url => options.merge(:page => paginator.current.previous)}, + {:href => url_for(:params => options.merge(:page => paginator.current.previous))}) + ' ' if paginator.current.previous html << (pagination_links_each(paginator, options) do |n| link_to_remote(n.to_s, - {:url => {:action => 'list', :params => {:page => n}}, :update => 'content'}, - {:href => url_for(:action => 'list', :params => {:page => n})}) + {:url => {:action => 'list', :params => options.merge(:page => n)}, :update => 'content'}, + {:href => url_for(:params => options.merge(:page => n))}) end || '') html << ' ' + link_to_remote((l(:label_next) + ' »'), - {:update => "content", :url => { :page => paginator.current.next }}, - {:href => url_for(:action => 'list', :params => {:page => paginator.current.next})}) if paginator.current.next + {:update => "content", :url => options.merge(:page => paginator.current.next)}, + {:href => url_for(:params => options.merge(:page => paginator.current.next))}) if paginator.current.next html end diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml index 5d6e26d3..2ffbcd6f 100644 --- a/app/views/users/list.rhtml +++ b/app/views/users/list.rhtml @@ -55,6 +55,6 @@ -

<%= pagination_links_full @user_pages %> +

<%= pagination_links_full @user_pages, :status => @status %> [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]

\ No newline at end of file