diff options
author | Uģis Ozols <ugis.ozolss@gmail.com> | 2011-07-27 22:50:02 +0300 |
---|---|---|
committer | Uģis Ozols <ugis.ozolss@gmail.com> | 2011-07-27 22:50:02 +0300 |
commit | d3da59e3f250f7b8f52946ab903efc8dcbe2a7cd (patch) | |
tree | ebe1f386ad49d391faf61d9251817dc1d7523550 /app | |
parent | 109184377f96db0530228cb3a8c38fe042e710c0 (diff) | |
download | refinerycms-blog-d3da59e3f250f7b8f52946ab903efc8dcbe2a7cd.tar.gz refinerycms-blog-d3da59e3f250f7b8f52946ab903efc8dcbe2a7cd.tar.bz2 refinerycms-blog-d3da59e3f250f7b8f52946ab903efc8dcbe2a7cd.zip |
Remove per_page pagination code from controllers.
Diffstat (limited to 'app')
-rw-r--r-- | app/controllers/refinery/admin/blog/posts_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/refinery/blog/categories_controller.rb | 8 | ||||
-rw-r--r-- | app/models/refinery/blog_category.rb | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/app/controllers/refinery/admin/blog/posts_controller.rb b/app/controllers/refinery/admin/blog/posts_controller.rb index ac30342..7304bd2 100644 --- a/app/controllers/refinery/admin/blog/posts_controller.rb +++ b/app/controllers/refinery/admin/blog/posts_controller.rb @@ -9,10 +9,8 @@ module Refinery :order => 'published_at DESC' def uncategorized - @blog_posts = Refinery::BlogPost.uncategorized.paginate({ - :page => params[:page], - :per_page => Refinery::BlogPost.per_page - }) + @blog_posts = Refinery::BlogPost.uncategorized + .page(params[:page]) end def tags diff --git a/app/controllers/refinery/blog/categories_controller.rb b/app/controllers/refinery/blog/categories_controller.rb index 2c8c4c5..a363b8c 100644 --- a/app/controllers/refinery/blog/categories_controller.rb +++ b/app/controllers/refinery/blog/categories_controller.rb @@ -4,10 +4,10 @@ module Refinery def show @category = Refinery::BlogCategory.find(params[:id]) - @blog_posts = @category.posts.live.includes(:comments, :categories).paginate({ - :page => params[:page], - :per_page => Refinery::Setting.find_or_set(:blog_posts_per_page, 10) - }) + @blog_posts = @category.posts + .live + .includes(:comments, :categories) + .page(params[:page]) end end diff --git a/app/models/refinery/blog_category.rb b/app/models/refinery/blog_category.rb index 7a35e67..c2c8c4c 100644 --- a/app/models/refinery/blog_category.rb +++ b/app/models/refinery/blog_category.rb @@ -16,6 +16,9 @@ module Refinery def post_count posts.select(&:live?).count end + + # how many items to show per page + paginates_per Refinery::Setting.find_or_set(:blog_posts_per_page, 10) end end |