forked from e621ng/e621ng
[Cleanup] Remove more pool post set code
This commit is contained in:
parent
cabe5866d7
commit
6214cbd16e
@ -2,10 +2,6 @@ require_relative "../danbooru/paginator/elasticsearch_extensions"
|
||||
|
||||
module PostSets
|
||||
class Pool < PostSets::Base
|
||||
module ActiveRecordExtension
|
||||
attr_accessor :total_pages, :current_page
|
||||
end
|
||||
|
||||
attr_reader :pool, :page
|
||||
|
||||
def initialize(pool, page = 1)
|
||||
@ -45,14 +41,6 @@ module PostSets
|
||||
@presenter ||= PostSetPresenters::Pool.new(self)
|
||||
end
|
||||
|
||||
def total_pages
|
||||
(pool.post_count.to_f / limit).ceil
|
||||
end
|
||||
|
||||
def size
|
||||
posts.size
|
||||
end
|
||||
|
||||
def current_page
|
||||
[page.to_i, 1].max
|
||||
end
|
||||
|
@ -1,16 +1,9 @@
|
||||
module PostSets
|
||||
class PoolGallery < PostSets::Base
|
||||
attr_reader :page, :per_page, :pools
|
||||
attr_reader :pools
|
||||
|
||||
def initialize(pools, page = 1, per_page = nil)
|
||||
def initialize(pools)
|
||||
@pools = pools
|
||||
@page = page
|
||||
@per_page = (per_page || CurrentUser.per_page).to_i
|
||||
@per_page = 200 if @per_page > 200
|
||||
end
|
||||
|
||||
def current_page
|
||||
[page.to_i, 1].max
|
||||
end
|
||||
|
||||
def presenter
|
||||
|
@ -34,11 +34,11 @@ module PostSets
|
||||
end
|
||||
|
||||
should "know the total number of pages" do
|
||||
assert_equal(3, @set.total_pages)
|
||||
assert_equal(3, @set.posts.total_pages)
|
||||
end
|
||||
|
||||
should "know the current page" do
|
||||
assert_equal(2, @set.current_page)
|
||||
assert_equal(2, @set.posts.current_page)
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user