fixes to limit

This commit is contained in:
albert
2013-01-14 16:38:33 -05:00
parent 60f2a06eee
commit c327653394
5 changed files with 4 additions and 7 deletions

View File

@@ -1,5 +1,6 @@
require "danbooru/paginator/active_record_extension"
require "danbooru/paginator/numbered_collection_extension"
require "danbooru/paginator/sequential_collection_extension"
require "danbooru/paginator/pagination_error"
ActiveRecord::Base.__send__(:include, Danbooru::Paginator::ActiveRecordExtension)

View File

@@ -65,8 +65,7 @@ module Danbooru
end
def records_per_page
# ugly hack but no easy way to pass this info down
(Thread.current["records_per_page"] || @paginator_options[:limit] || Danbooru.config.posts_per_page).to_i
(@paginator_options[:limit] || Danbooru.config.posts_per_page).to_i
end
# taken from kaminari (https://github.com/amatsuda/kaminari)