fixed 删除用户时issue,pr用户显示已注销

This commit is contained in:
xxq250 2024-10-09 15:31:17 +08:00
parent 4e855a2a7b
commit 4002245601
3 changed files with 7 additions and 14 deletions

View File

@ -148,9 +148,9 @@ module ApplicationHelper
if File.exist?(disk_filename(source&.class, source&.id)) if File.exist?(disk_filename(source&.class, source&.id))
ctime = File.ctime(disk_filename(source.class, source.id)).to_i ctime = File.ctime(disk_filename(source.class, source.id)).to_i
if %w(User Organization).include?(source.class.to_s) if %w(User Organization).include?(source.class.to_s)
File.join("images", relative_path, ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" File.join("images", relative_path, ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
else else
File.join("images/avatars", ["#{source.class}", "#{source.id}"]) + "?t=#{ctime}" File.join("images/avatars", ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
end end
elsif source.class.to_s == 'User' elsif source.class.to_s == 'User'
source.get_letter_avatar_url source.get_letter_avatar_url

View File

@ -27,18 +27,10 @@ json.milestone do
end end
end end
json.author do json.author do
if issue.user.present? json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
json.partial! "api/v1/users/simple_user", locals: {user: issue.user}
else
json.nil!
end
end end
json.changer do json.changer do
if issue.changer.present? json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
json.partial! "api/v1/users/simple_user", locals: {user: issue.changer}
else
json.nil!
end
end end
json.assigners issue.show_assigners.each do |assigner| json.assigners issue.show_assigners.each do |assigner|
json.partial! "api/v1/users/simple_user", locals: {user: assigner} json.partial! "api/v1/users/simple_user", locals: {user: assigner}

View File

@ -4,6 +4,7 @@ if user.present?
json.name user.real_name json.name user.real_name
json.login user.login json.login user.login
json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s json.image_url Rails.application.config_for(:configuration)['platform_url'] + "/" + url_to_avatar(user).to_s
else else
json.nil! json.name "已注销"
json.login ""
end end