diff --git a/app/controllers/problems_controller.rb b/app/controllers/problems_controller.rb --- a/app/controllers/problems_controller.rb +++ b/app/controllers/problems_controller.rb @@ -12,9 +12,7 @@ :redirect_to => { :action => :list } def list - @problem_pages, @problems = paginate(:problems, - :per_page => 10, - :order => 'date_added DESC') + @problems = Problem.find(:all, :order => 'date_added DESC') end def show 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 @@ -12,7 +12,7 @@ :redirect_to => { :action => :list } def list - @user_pages, @users = paginate :users, :per_page => 50 + @users = User.find(:all) end def show diff --git a/app/models/submission.rb b/app/models/submission.rb --- a/app/models/submission.rb +++ b/app/models/submission.rb @@ -2,6 +2,7 @@ belongs_to :language belongs_to :problem + belongs_to :user def self.find_by_user_and_problem(user_id, problem_id) subcount = count(:conditions => "user_id = #{user_id} AND problem_id = #{problem_id}") diff --git a/app/views/problems/list.rhtml b/app/views/problems/list.rhtml --- a/app/views/problems/list.rhtml +++ b/app/views/problems/list.rhtml @@ -25,8 +25,6 @@ <% end %> -<%= link_to 'Previous page', { :page => @problem_pages.current.previous } if @problem_pages.current.previous %> -<%= link_to 'Next page', { :page => @problem_pages.current.next } if @problem_pages.current.next %>
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 @@ -47,8 +47,6 @@ <% end %> -<%= 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 %>
diff --git a/config/environment.rb b/config/environment.rb --- a/config/environment.rb +++ b/config/environment.rb @@ -5,7 +5,7 @@ # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '1.2.4' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') diff --git a/config/environments/development.rb b/config/environments/development.rb --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -9,7 +9,7 @@ config.whiny_nils = true # Enable the breakpoint server that script/breakpointer connects to -config.breakpoint_server = true +#config.breakpoint_server = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true