FIX: compatibility after allowlist rewording in Discourse

2020-07-15 10:13:22 +10:00 · 2020-07-15 10:13:22 +10:00 · 2fad44a6a0
parent bc26f099fa
commit 2fad44a6a0
1 changed files with 6 additions and 1 deletions
--- a/app/controllers/discourse_assign/assign_controller.rb
+++ b/app/controllers/discourse_assign/assign_controller.rb
@ -102,7 +102,12 @@ module DiscourseAssign
        .select(AvatarLookup.lookup_columns)
        .to_a

-      User.preload_custom_fields(users, User.whitelisted_user_custom_fields(guardian))
+      # 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
+        User.preload_custom_fields(users, User.allowed_user_custom_fields(guardian))
+      end

      users = users.to_h { |u| [u.id, u] }
      topics.each do |t|