From 24b14d76e75b1ca944055014ee2ef2147dc9b0ac Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 20 Dec 2013 21:39:33 +0800 Subject: [PATCH] fix aplication paginate my bug. --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 5535a0cd2..b5b0bdb5f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -622,8 +622,8 @@ class ApplicationController < ActionController::Base ## Please added code in html. # def paginateHelper obj, pre_size=20 - @obj_count = objs_all.count - @obj_pages = Paginator.new @obj_count, limit, params['page'] + @obj_count = obj.count + @obj_pages = Paginator.new @obj_count, pre_size, params['page'] if obj.kind_of? ActiveRecord::Base or obj.kind_of? ActiveRecord::Relation obj.limit(@obj_pages.per_page).offset(@obj_pages.offset).all elsif obj.kind_of? Array