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

FIX: check if allowed_user_custom_fields exisits

This commit is contained in:
Krzysztof Kotlarek 2020-07-27 12:11:35 +10:00
parent 26682ccec4
commit 8e7ef2b797
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,10 +108,10 @@ module DiscourseAssign
.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))
else
if User.respond_to?(:allowed_user_custom_fields)
User.preload_custom_fields(users, User.allowed_user_custom_fields(guardian))
else
User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian))
end
users = users.to_h { |u| [u.id, u] }