discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: compatibility after allowlist rewording in Discourse

This commit is contained in:
Krzysztof Kotlarek 2020-07-15 10:13:22 +10:00
parent bc26f099fa
commit 2fad44a6a0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/discourse_assign/assign_controller.rb
View File

@ -102,7 +102,12 @@ module DiscourseAssign
.select(AvatarLookup.lookup_columns) .select(AvatarLookup.lookup_columns)
.to_a .to_a
# TODO Drop after Discourse 2.6.0 release
if User.respond_to?(:whitelisted_user_custom_fields)
User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian)) User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian))
else
User.preload_custom_fields(users, User.allowed_user_custom_fields(guardian))
end
users = users.to_h { |u| [u.id, u] } users = users.to_h { |u| [u.id, u] }
topics.each do |t| topics.each do |t|