Download as
Browse Code »

Commit 115250ff3e57b8480ae82d022b7d6bb4f4e93d6c

Authored by Nick Recobra
1 parent ec51e940
Exists in master and in 1 other branch production

Pagination fixed. WillPaginate Mongoid extension requires [per_page] param.

Showing 5 changed files with 8 additions and 4 deletions   Show diff stats
app/controllers/apps_controller.rb
  Diff comments   View file @115250f
... ... @@ -8,7 +8,7 @@ class AppsController < ApplicationController
8 8 end
9 9  
10 10 def show
11   - @errs = @app.errs.paginate
  11 + @errs = @app.errs.paginate(:page => params[:page], :per_page => Err.per_page)
12 12 end
13 13  
14 14 def new
... ...
app/controllers/errs_controller.rb
  Diff comments   View file @115250f
... ... @@ -4,12 +4,12 @@ class ErrsController < ApplicationController
4 4  
5 5 def index
6 6 app_scope = current_user.admin? ? App.all : current_user.apps
7   - @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page])
  7 + @errs = Err.for_apps(app_scope).unresolved.ordered.paginate(:page => params[:page], :per_page => Err.per_page)
8 8 end
9 9  
10 10 def all
11 11 app_scope = current_user.admin? ? App.all : current_user.apps
12   - @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page])
  12 + @errs = Err.for_apps(app_scope).ordered.paginate(:page => params[:page], :per_page => Err.per_page)
13 13 end
14 14  
15 15 def show
... ...
app/controllers/users_controller.rb
  Diff comments   View file @115250f
... ... @@ -6,7 +6,7 @@ class UsersController < ApplicationController
6 6 before_filter :require_user_edit_priviledges, :only => [:edit, :update]
7 7  
8 8 def index
9   - @users = User.paginate(:page => params[:page])
  9 + @users = User.paginate(:page => params[:page], :per_page => User.per_page)
10 10 end
11 11  
12 12 def show
... ...
app/models/err.rb
  Diff comments   View file @115250f
1 1 class Err
  2 + cattr_reader :per_page
  3 + @@per_page = 30
2 4 include Mongoid::Document
3 5 include Mongoid::Timestamps
4 6  
... ...
app/models/user.rb
  Diff comments   View file @115250f
1 1 class User
  2 + cattr_reader :per_page
  3 + @@per_page = 30
2 4 include Mongoid::Document
3 5 include Mongoid::Timestamps
4 6  
... ...