jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug fix

Browse Source
This commit is contained in:
albert
2013-01-14 16:13:02 -05:00
parent 966962cf80
commit 60f2a06eee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/danbooru/paginator/active_record_extension.rb
View File

@@ -7,7 +7,7 @@ module Danbooru
module ClassMethods module ClassMethods
def paginate(page, options = {}) def paginate(page, options = {})
@paginator_options = options || {} @paginator_options = options
if use_sequential_paginator?(page) if use_sequential_paginator?(page)
paginate_sequential(page) paginate_sequential(page)
@@ -66,7 +66,7 @@ module Danbooru
def records_per_page def records_per_page
# ugly hack but no easy way to pass this info down # ugly hack but no easy way to pass this info down
(@paginator_options[:limit] || Thread.current["records_per_page"] || Danbooru.config.posts_per_page).to_i (Thread.current["records_per_page"] || @paginator_options[:limit] || Danbooru.config.posts_per_page).to_i
end end
# taken from kaminari (https://github.com/amatsuda/kaminari) # taken from kaminari (https://github.com/amatsuda/kaminari)