Fixed pagination on users/list (status filter lost)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@409 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index dc07a8f93c01189b65c0f92350099bce3466db30..abf5e03d10b30e1beb2b10dfef30bc74b717e5c3 100644 (file)
--- 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(('&#171; ' + 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) + ' &#187;'), 
-                                 {: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 5d6e26d377fe4334024fe02c030c87c22553396b..2ffbcd6f6f4ad0e2f6189adcecc0d11c8ad6150e 100644 (file)
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -55,6 +55,6 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @user_pages %>
+<p><%= pagination_links_full @user_pages, :status => @status %>
 [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
 </p>
\ No newline at end of file