From 625a0d87d912b5a9cb4b35b54a91742037de6dcb Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Wed, 7 Feb 2024 23:40:22 +0400 Subject: [PATCH 1/2] Stop using FoundUserWithStatusSerializer --- app/controllers/discourse_assign/assign_controller.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/discourse_assign/assign_controller.rb b/app/controllers/discourse_assign/assign_controller.rb index 846faff0..63926568 100644 --- a/app/controllers/discourse_assign/assign_controller.rb +++ b/app/controllers/discourse_assign/assign_controller.rb @@ -8,9 +8,6 @@ class AssignController < ApplicationController 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 @@ def suggestions ActiveModel::ArraySerializer.new( users, scope: guardian, - each_serializer: each_serializer, + each_serializer: FoundUserSerializer, + include_status: true, ), } end From 9210969c9ffcb85670fb3a655463ae7dcb092c85 Mon Sep 17 00:00:00 2001 From: Andrei Prigorshnev Date: Mon, 4 Mar 2024 20:17:19 +0400 Subject: [PATCH 2/2] Add a .discourse-compatibility entry --- .discourse-compatibility | 1 + 1 file changed, 1 insertion(+) diff --git a/.discourse-compatibility b/.discourse-compatibility index 132f35cc..78499760 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