Merge pull request #26 from morganp/clean_pagination

Article Pagination using kaminari
mendicant-original · Jun 27, 2011 · 9b834a1 · 9b834a1
2 parents 66ff352 + c3b784f
commit 9b834a1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,7 @@ gem "omniauth", '~> 0.2.5'
 gem "pg"
 gem "rdiscount"
 gem "rest-client", '~> 1.6.3'
+gem "kaminari", '~> 0.12.4'
 
 group :test do
   gem "capybara"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -68,6 +68,8 @@ GEM
       railties (~> 3.0)
       thor (~> 0.14)
     json_pure (1.5.3)
+    kaminari (0.12.4)
+      rails (>= 3.0.0)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -178,6 +180,7 @@ DEPENDENCIES
   factory_girl_rails
   haml-rails
   jquery-rails
+  kaminari (~> 0.12.4)
   mocha
   omniauth (~> 0.2.5)
   pg

diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
@@ -3,7 +3,7 @@ class ArticlesController < ApplicationController
   before_filter :find_article, :authorized_users_only, :only => [:edit, :update, :destroy]
 
   def index
-    @articles = Article.includes(:author).order("id desc")
+    @articles = Article.includes(:author).order("id desc").page(params[:page])
   end
 
   def new

diff --git a/app/views/articles/index.html.haml b/app/views/articles/index.html.haml
@@ -1,3 +1,4 @@
+= paginate @articles  
 %ul
   - @articles.each do |article|
     = content_tag_for :li, article do