FEATURE: support staff only custom user fields

This commit is contained in:
Sam
2015-03-03 17:51:01 +11:00
parent 0ec56ed903
commit 9698447e89
3 changed files with 9 additions and 0 deletions
+5
View File
@@ -42,6 +42,11 @@ class TopicView
@user_custom_fields = User.custom_fields_for_ids(@posts.map(&:user_id), SiteSetting.public_user_custom_fields.split('|'))
end
if @guardian.is_staff? && SiteSetting.staff_user_custom_fields.present? && @posts
@user_custom_fields ||= {}
@user_custom_fields.deep_merge!(User.custom_fields_for_ids(@posts.map(&:user_id), SiteSetting.staff_user_custom_fields.split('|')))
end
@draft_key = @topic.draft_key
@draft_sequence = DraftSequence.current(@user, @draft_key)
end