github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 01:47:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: Show user cards for inactive users (#21387)

Browse Source 
It used to return 404 which made the user card render and then quickly disappear.
This commit is contained in:
Bianca Nenciu
2023-05-15 20:45:26 +02:00
committed by GitHub
parent e25468b2ca
commit 78022e7a5f
8 changed files with 116 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/users_controller.rb
View File

@ -110,12 +110,15 @@ class UsersController < ApplicationController
@user =
fetch_user_from_params(
include_inactive:
current_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts),
include_inactive: current_user&.staff? || for_card || SiteSetting.show_inactive_accounts,
)
user_serializer = nil
if guardian.can_see_profile?(@user)
if !current_user&.staff? && !@user.active?
user_serializer = InactiveUserSerializer.new(@user, scope: guardian, root: "user")
elsif !guardian.can_see_profile?(@user)
user_serializer = HiddenProfileSerializer.new(@user, scope: guardian, root: "user")
else
serializer_class = for_card ? UserCardSerializer : UserSerializer
user_serializer = serializer_class.new(@user, scope: guardian, root: "user")
@ -125,8 +128,6 @@ class UsersController < ApplicationController
topic_id => Post.secured(guardian).where(topic_id: topic_id, user_id: @user.id).count,
}
end
else
user_serializer = HiddenProfileSerializer.new(@user, scope: guardian, root: "user")
end
track_visit_to_user_profile if !params[:skip_track_visit] && (@user != current_user)