Merge pull request olivierlacan#4 from stmichael/paging_support

Pagination for gif index page
RxuqZ256 · Sep 10, 2012 · 7eb4e79 · 7eb4e79
2 parents 31fdcfa + 15a9660
commit 7eb4e79
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -15,6 +15,7 @@ gem 'haml-rails'
 gem 'simple_form'
 gem 'jquery-rails'
 gem 'rails_tokeninput'
+gem 'will_paginate'
 
 gem 'unicorn'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -127,6 +127,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    will_paginate (3.0.3)
 
 PLATFORMS
   ruby
@@ -144,3 +145,4 @@ DEPENDENCIES
   simple_form
   uglifier (>= 1.0.3)
   unicorn
+  will_paginate
diff --git a/app/controllers/gifs_controller.rb b/app/controllers/gifs_controller.rb
@@ -3,7 +3,7 @@ class GifsController < ApplicationController
   respond_to :html, :json
 
   def index
-    respond_with @gifs = Gif.all
+    respond_with @gifs = Gif.paginate(:page => params[:page], :per_page => 20)
   end
 
   def show

diff --git a/app/views/gifs/index.html.haml b/app/views/gifs/index.html.haml
@@ -4,6 +4,8 @@
   = f.input :tag_tokens, label: "Keywords" #, input_html: { data: {load: Tag.all} }
   = f.submit
 
+= will_paginate @gifs
+
 - unless @gifs.empty?
   %ul#gif-list
     - @gifs.reverse_each do |gif|