Revert "Preload custom user fields when viewing flag queue"

This reverts commit 5bd1c5cc95.
This commit is contained in:
Joshua Rosenfeld 2018-06-12 16:46:31 -04:00
parent 5bd1c5cc95
commit 1bb12ee1b6
2 changed files with 2 additions and 21 deletions

View File

@ -3,8 +3,7 @@ class FlaggedUserSerializer < BasicUserSerializer
:can_be_deleted,
:post_count,
:topic_count,
:ip_address,
:custom_fields
:ip_address
def can_delete_all_posts
scope.can_delete_all_posts?(object)
@ -18,19 +17,4 @@ class FlaggedUserSerializer < BasicUserSerializer
object.ip_address.try(:to_s)
end
def custom_fields
fields = User.whitelisted_user_custom_fields(scope)
if scope.can_edit?(object)
fields += DiscoursePluginRegistry.serialized_current_user_fields.to_a
end
result = {}
fields.each do |k|
result[k] = object.custom_fields[k] if object.custom_fields[k].present?
end
result
end
end

View File

@ -129,13 +129,10 @@ 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,
users,
User.includes(:user_stat).where(id: user_ids.to_a).to_a,
all_post_actions,
total_rows
]