From 8e7ef2b797400abc911df21447f653ce164863be Mon Sep 17 00:00:00 2001 From: Krzysztof Kotlarek Date: Mon, 27 Jul 2020 12:11:35 +1000 Subject: [PATCH] FIX: check if allowed_user_custom_fields exisits --- app/controllers/discourse_assign/assign_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/discourse_assign/assign_controller.rb b/app/controllers/discourse_assign/assign_controller.rb index 3de9ff9..ec591f4 100644 --- a/app/controllers/discourse_assign/assign_controller.rb +++ b/app/controllers/discourse_assign/assign_controller.rb @@ -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] }