floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

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

This commit is contained in:
xxq250 2024-10-09 15:41:29 +08:00
parent 34ee9d1cbf
commit 6f8ccea616
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/application_helper.rb
View File

@ -146,13 +146,13 @@ module ApplicationHelper
# 用户图像url，如果不存在的话，source为匿名用户，即默认使用匿名用户图像 # 用户图像url，如果不存在的话，source为匿名用户，即默认使用匿名用户图像
def url_to_avatar(source) def url_to_avatar(source)
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
end end
end end

10
app/helpers/avatar_helper.rb
View File

@ -13,13 +13,13 @@ module AvatarHelper
def url_to_avatar(source) def url_to_avatar(source)
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
end end
end end