Merge branch 'master' of github.com:r888888888/danbooru

This commit is contained in:
r888888888
2013-05-13 10:45:42 -07:00
30 changed files with 168 additions and 70 deletions

View File

@@ -5,7 +5,7 @@ module Moderator
def initialize(min_date, max_level)
@min_date = min_date.present? ? min_date.to_date : 1.week.ago
@max_level = max_level.present? ? User::Levels::MEMBER : max_level.to_i
@max_level = max_level.present? ? max_level.to_i : User::Levels::MEMBER
end
def artists

View File

@@ -69,10 +69,6 @@ module PostSets
tag_string =~ /\*/
end
def is_empty_search?
posts.count == 0
end
def current_page
[page.to_i, 1].max
end

View File

@@ -2,7 +2,7 @@ module PostSets
class SearchError < Exception
end
class WikiPage < Post
class WikiPage < PostSets::Post
def presenter
@presenter ||= ::PostSetPresenters::WikiPage.new(self)
end