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

Fix Rails 4.1 migration issues

Browse Source
This commit is contained in:
r888888888
2014-04-24 16:15:59 -07:00
parent 616aef4394
commit a89c57cee0
7 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/presenters/post_set_presenters/post.rb
View File

@@ -31,7 +31,7 @@ module PostSetPresenters
end
def pattern_tags
Tag.name_matches(post_set.tag_string).all(:select => "name", :limit => Danbooru.config.tag_query_limit, :order => "post_count DESC").map(&:name)
Tag.name_matches(post_set.tag_string).select("name").limit(Danbooru.config.tag_query_limit).order("post_count DESC").map(&:name)
end
def related_tags_for_group

2
app/presenters/user_presenter.rb
View File

@@ -75,7 +75,7 @@ class UserPresenter
def favorites
@favorites ||= begin
arel = user.favorites.limit(6).includes(:post).reorder("favorites.id desc")
arel = user.favorites.limit(6).joins(:post).reorder("favorites.id desc")
if CurrentUser.user.hide_deleted_posts?
arel = arel.where("posts.is_deleted = false")