github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 17:51:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "Revert "Preload custom user fields when viewing flag queue""

Browse Source 
This reverts commit 1bb12ee1b6f0c5428a046bb01a2c12f969cc6480.
This commit is contained in:
Robin Ward
2018-06-13 11:44:13 -04:00
parent 4107a02ae8
commit ae728702a6
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/flag_query.rb
View File

@ -129,10 +129,13 @@ module FlagQuery
# TODO: add serializer so we can skip this
posts.map!(&:marshal_dump)
users = User.includes(:user_stat).where(id: user_ids.to_a).to_a
User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian))
[
posts,
Topic.with_deleted.where(id: topic_ids.to_a).to_a,
User.includes(:user_stat).where(id: user_ids.to_a).to_a,
users,
all_post_actions,
total_rows
]