diff --git a/Gemfile b/Gemfile index ab61680..0cd6e11 100644 --- a/Gemfile +++ b/Gemfile @@ -57,3 +57,6 @@ end # Twitter Bootstrap template gem 'bootstrap-sass' + +# Pagination +gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 2590554..6b895d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,6 +57,9 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.0) + kaminari (0.14.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -132,6 +135,7 @@ DEPENDENCIES coffee-rails (~> 4.0.0) jbuilder (~> 1.2) jquery-rails + kaminari meta_request pg rails (= 4.0.0) diff --git a/app/controllers/packages_controller.rb b/app/controllers/packages_controller.rb index a8fa074..3c241d6 100644 --- a/app/controllers/packages_controller.rb +++ b/app/controllers/packages_controller.rb @@ -12,7 +12,8 @@ class PackagesController < ApplicationController @packages = @packages.includes(:screenshots).where("screenshots.approved"=>true) end - @packages = @packages.limit(20) + #@packages = @packages.limit(20) + @packages = @packages.page(params[:page]).per(12) end def with_screenshots diff --git a/app/views/packages/_packages_search_results.html.erb b/app/views/packages/_packages_search_results.html.erb index 846983d..17816a1 100644 --- a/app/views/packages/_packages_search_results.html.erb +++ b/app/views/packages/_packages_search_results.html.erb @@ -1,6 +1,7 @@ <% # Show search results %> <% if @packages.length>0 %> + <%= paginate @packages %>