From a1686e1ca9876b49be8f7f19a018d7298dd348e6 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Thu, 14 Mar 2024 13:44:48 +0000 Subject: [PATCH] DEV: Stop using FoundUserWithStatusSerializer (#546) Starting from https://github.com/discourse/discourse/commit/b3a1199493a5974353449e2b3f1b30d9eabbff59 we stop using deprecated "WithStatus" serializers. Instead we'll be passing an 'include_status' option to serilaizers, for example: ```ruby # before BasicUserWithStatusSerializer.new(user) ArraySerializer.new(users, each_serializer: BasicUserWithStatusSerializer) # now BasicUserSerializer.new(user, include_status: true) ArraySerializer.new(users, each_serializer: BasicUserSerializer, include_status: true) ``` --- .discourse-compatibility | 1 + app/controllers/discourse_assign/assign_controller.rb | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.discourse-compatibility b/.discourse-compatibility index 132f35c..7849976 100644 --- a/.discourse-compatibility +++ b/.discourse-compatibility @@ -1,4 +1,5 @@ < 3.3.0.beta1-dev: 56b0de3896361b6a87523537c8f5b450d2fe0807 +3.2.0: 33c43ca51ac7b7baa8a309a269dcf8685b8bd638 < 3.2.0.beta2-dev: ac930c509e2a5b0c37b84bcea28d332e686add95 3.1.999: a304cd2028ccf1f5b00f5137633aa7027a1fd334 3.1.0.beta3: 9c270cac9abc1c2b30574d8c655fb3a90546236b diff --git a/app/controllers/discourse_assign/assign_controller.rb b/app/controllers/discourse_assign/assign_controller.rb index 846faff..6392656 100644 --- a/app/controllers/discourse_assign/assign_controller.rb +++ b/app/controllers/discourse_assign/assign_controller.rb @@ -8,9 +8,6 @@ module DiscourseAssign def suggestions users = [current_user, *recent_assignees] - each_serializer = - SiteSetting.enable_user_status? ? FoundUserWithStatusSerializer : FoundUserSerializer - render json: { assign_allowed_on_groups: Group.visible_groups(current_user).assign_allowed_groups.pluck(:name), @@ -20,7 +17,8 @@ module DiscourseAssign ActiveModel::ArraySerializer.new( users, scope: guardian, - each_serializer: each_serializer, + each_serializer: FoundUserSerializer, + include_status: true, ), } end