@@ -16,7 +16,7 @@ class UsersController < ApplicationController
respond_to do |format|
format.html do
@page_title = "TRACKS::Manage Users"
- @user_pages, @users = paginate :users, :order => 'login ASC', :per_page => 10
+ @users = User.paginate :page => params[:page], :order => 'login ASC'
@total_users = User.count
# When we call users/signup from the admin page
# we store the URL so that we get returned here when signup is successful
app/controllers/users_controller.rb
@@ -103,6 +103,10 @@ class User < ActiveRecord::Base
before_create :crypt_password, :generate_token
before_update :crypt_password
before_save :normalize_open_id_url
+
+ #for will_paginate plugin
+ cattr_accessor :per_page
+ @@per_page = 1
def validate
unless Tracks::Config.auth_schemes.include?(auth_type)
app/models/user.rb
@@ -29,8 +29,7 @@
<% end %>
</table>
<p>
- <%= link_to "« Previous page", { :page => @user_pages.current.previous } if @user_pages.current.previous %>
- <%= link_to "Next page »", { :page => @user_pages.current.next } if @user_pages.current.next %>
+ <%= will_paginate @users %>
</p>
<p><%= link_to 'Signup new user', signup_path %></p>
\ No newline at end of file
app/views/users/index.html.erb
@@ -34,6 +34,20 @@ class UsersControllerTest < Test::Rails::TestCase
assert_equal 3, assigns['total_users']
assert_equal "/users", session['return-to']
end
+
+ def test_index_pagination_page_1
+ User.per_page = 1
+ login_as :admin_user
+ get :index
+ assert_equal assigns['users'],[User.find_by_login('admin')]
+ end
+
+ def test_index_pagination_page_2
+ User.per_page = 1
+ login_as :admin_user
+ get :index, :page => 2
+ assert_equal assigns['users'],[User.find_by_login('jane')]
+ end
def test_destroy_user
login_as :admin_user
test/functional/users_controller_test.rb
2f1b15fed34c1a5cec4c4e81bbf139d71f79106c
MHarris
MHarris@PCI-MHarris.princeton.com
http://github.com/bsag/tracks/commit/ed76cf55d29cb07e405dbea0539cef5a52ff6055
ed76cf55d29cb07e405dbea0539cef5a52ff6055
2008-07-14T10:10:55-07:00
2008-07-14T10:10:55-07:00
Changed UsersController#index to use will_paginate plugin instead of classic_pagination
Made corresponding change in view.
Added User.per_page method to provide number of users per page to User.paginate button. I can remove and just pass the param to the method in the controller if that is more desirable.
Added 2 controller tests for pagination. No view tests have been added.
9e38dc065c6eb7b688475f774dfe7c543cdc95e7
MHarris
MHarris@PCI-MHarris.princeton.com