github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-02 01:55:02 +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

18
app/serializers/flagged_user_serializer.rb
View File

@ -3,7 +3,8 @@ class FlaggedUserSerializer < BasicUserSerializer
:can_be_deleted,
:post_count,
:topic_count,
:ip_address
:ip_address,
:custom_fields
def can_delete_all_posts
scope.can_delete_all_posts?(object)
@ -17,4 +18,19 @@ 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