diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -17,7 +17,13 @@ def list @user_count = User.count - @users = User.paginate :page => params[:page] + if params[:page] == 'all' + @users = User.all + @paginated = false + else + @users = User.paginate :page => params[:page] + @paginated = true + end @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at'] @contests = Contest.enabled end diff --git a/app/views/user_admin/list.rhtml b/app/views/user_admin/list.rhtml --- a/app/views/user_admin/list.rhtml +++ b/app/views/user_admin/list.rhtml @@ -44,7 +44,15 @@ <% end %> -Total <%= @user_count %> users | <%= will_paginate @users, :container => false %> +Total <%= @user_count %> users | +<% if !@paginated %> + Display all users. + <%= link_to '[show in pages]', :action => 'list', :page => '1' %> +<% else %> + Display in pages. + <%= link_to '[display all]', :action => 'list', :page => 'all' %> | + <%= will_paginate @users, :container => false %> +<% end %>