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

Merge pull request #2895 from evazion/fix-modqueue-dtext

Browse Source 
modqueue: link tags, optimize sql, use dtext in disapproval reasons.
This commit is contained in:
Albert Yi
2017-02-27 16:47:19 -08:00
committed by GitHub
parent b332273378 b80976bce7
commit 27a85cd066
7 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/moderator/post/queues_controller.rb
View File

@@ -15,7 +15,7 @@ module Moderator
end
::Post.without_timeout do
@posts = ::Post.order("posts.id asc").pending_or_flagged.available_for_moderation(params[:hidden]).tag_match(params[:query]).paginate(params[:page], :limit => per_page)
@posts = ::Post.includes(:disapprovals, :uploader).order("posts.id asc").pending_or_flagged.available_for_moderation(params[:hidden]).tag_match(params[:query]).paginate(params[:page], :limit => per_page)
@posts.each # hack to force rails to eager load
end
respond_with(@posts)
@@ -25,7 +25,7 @@ module Moderator
cookies.permanent[:moderated] = Time.now.to_i
::Post.without_timeout do
@posts = ::Post.order("posts.id asc").pending_or_flagged.available_for_moderation(false).reorder("random()").limit(RANDOM_COUNT)
@posts = ::Post.includes(:disapprovals, :uploader).order("posts.id asc").pending_or_flagged.available_for_moderation(false).reorder("random()").limit(RANDOM_COUNT)
@posts.each # hack to force rails to eager load
if @posts.empty?