Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Replaced will_paginate by kaminari

  • Loading branch information...
commit adbcf1cbd0a521cd68d89929a2fbf093e11ce1aa 1 parent be2ab06
@mokevnin authored
View
2  Gemfile
@@ -15,7 +15,7 @@ gem 'state_machine'
gem 'hoptoad_notifier'
gem 'haml'
gem 'sass'
-gem 'will_paginate', '>= 3.0.pre2'
+gem 'kaminari'
gem 'thinking-sphinx'
gem "oa-oauth"
gem "oa-openid"
View
11 Gemfile.lock
@@ -1,12 +1,12 @@
GIT
remote: git://github.com/sferik/rails_admin.git
- revision: 2b4573ee2e7a92fcfc408dbc32a10cd2ab5f3abc
+ revision: 82aee9c8a068ed163819dc9a2f37d7869a6935bd
specs:
rails_admin (0.0.1)
builder (~> 2.1.0)
fastercsv
- haml (>= 3.0.0, < 3.2.0)
- rails (~> 3.0.7)
+ haml (>= 3.1.0, < 3.3.0)
+ rails (~> 3.0.9)
GEM
remote: http://rubygems.org/
@@ -82,6 +82,8 @@ GEM
jquery-rails (1.0.12)
railties (~> 3.0)
thor (~> 0.14)
+ kaminari (0.12.4)
+ rails (>= 3.0.0)
mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
@@ -205,7 +207,6 @@ GEM
webmock (1.6.2)
addressable (>= 2.2.2)
crack (>= 0.1.7)
- will_paginate (3.0.pre2)
yamler (0.1.0)
yard (0.7.2)
@@ -224,6 +225,7 @@ DEPENDENCIES
haml
hoptoad_notifier
jquery-rails
+ kaminari
oa-oauth
oa-openid
omniauth (>= 0.2.6)
@@ -240,5 +242,4 @@ DEPENDENCIES
state_machine
thinking-sphinx
webmock
- will_paginate (>= 3.0.pre2)
yard
View
2  app/controllers/web/communities/blogs/posts_controller.rb
@@ -1,7 +1,7 @@
class Web::Communities::Blogs::PostsController < Web::Communities::ApplicationController
def index
- @posts = blog.published_posts.paginate :page => params[:page]
+ @posts = blog.published_posts.page params[:page]
end
def show
View
2  app/controllers/web/communities/blogs_controller.rb
@@ -1,7 +1,7 @@
class Web::Communities::BlogsController < Web::Communities::ApplicationController
def index
- @blogs = community.published_blogs.paginate :page => params[:page]
+ @blogs = community.published_blogs.page params[:page]
end
end
View
2  app/controllers/web/communities/members/comments_controller.rb
@@ -1,7 +1,7 @@
class Web::Communities::Members::CommentsController < Web::Communities::Members::ApplicationController
def index
- @comments = member.comments.paginate :page => params[:page]
+ @comments = member.comments.page params[:page]
title 'Comments'
end
View
2  app/controllers/web/communities/members/posts_controller.rb
@@ -3,7 +3,7 @@ class Web::Communities::Members::PostsController < Web::Communities::Members::Ap
def index
scope = member.send(current_community_member ? :posts : :published_posts)
- @posts = scope.paginate :page => params[:page]
+ @posts = scope.page params[:page]
title 'Posts'
end
View
2  app/controllers/web/communities/members_controller.rb
@@ -1,7 +1,7 @@
class Web::Communities::MembersController < Web::Communities::ApplicationController
def index
- @members = community.members.paginate :page => params[:page]
+ @members = community.members.page params[:page]
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.