From 115250ff3e57b8480ae82d022b7d6bb4f4e93d6c Mon Sep 17 00:00:00 2001
From: Nick Recobra <oruen@undev.ru>
Date: Tue, 23 Nov 2010 17:15:34 +0300
Subject: [PATCH] Pagination fixed. WillPaginate Mongoid extension requires [per_page] param.

---
 app/controllers/apps_controller.rb  | 2 +-
 app/controllers/errs_controller.rb  | 4 ++--
 app/controllers/users_controller.rb | 2 +-
 app/models/err.rb                   | 2 ++
 app/models/user.rb                  | 2 ++
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/controllers/apps_controller.rb b/app/controllers/apps_controller.rb
index e357d5a..2b27d37 100644
--- a/app/controllers/apps_controller.rb
+++ b/app/controllers/apps_controller.rb
@@ -8,7 +8,7 @@ class AppsController < ApplicationController
   end
   
   def show
-    @errs  = @app.errs.paginate
+    @errs  = @app.errs.paginate(:page => params[:page], :per_page => Err.per_page)
   end
   
   def new
diff --git a/app/controllers/errs_controller.rb b/app/controllers/errs_controller.rb
index 12856ac..b4093c0 100644
--- a/app/controllers/errs_controller.rb
+++ b/app/controllers/errs_controller.rb
@@ -4,12 +4,12 @@ class ErrsController < ApplicationController
   
   def index
     app_scope = current_user.admin? ? App.all : current_user.apps
-    @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page])
+    @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page], :per_page => Err.per_page)
   end
   
   def all
     app_scope = current_user.admin? ? App.all : current_user.apps
-    @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page])
+    @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => Err.per_page)
   end
   
   def show
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 2537355..932f46d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -6,7 +6,7 @@ class UsersController < ApplicationController
   before_filter :require_user_edit_priviledges, :only => [:edit, :update]
   
   def index
-    @users = User.paginate(:page => params[:page])
+    @users = User.paginate(:page => params[:page], :per_page => User.per_page)
   end
   
   def show
diff --git a/app/models/err.rb b/app/models/err.rb
index e55c3e7..3d28c7c 100644
--- a/app/models/err.rb
+++ b/app/models/err.rb
@@ -1,4 +1,6 @@
 class Err
+  cattr_reader :per_page
+  @@per_page = 30
   include Mongoid::Document
   include Mongoid::Timestamps
   
diff --git a/app/models/user.rb b/app/models/user.rb
index 603d1d1..aac2ab7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,4 +1,6 @@
 class User
+  cattr_reader :per_page
+  @@per_page = 30
   include Mongoid::Document
   include Mongoid::Timestamps
 
--
libgit2 0.21.2