mirror of
https://gitlink.org.cn/Gitlink/forgeplus.git
synced 2026-05-02 19:30:48 +08:00
fixed 删除用户时issue,pr用户显示已注销
This commit is contained in:
@@ -146,13 +146,13 @@ module ApplicationHelper
|
||||
# 用户图像url,如果不存在的话,source为匿名用户,即默认使用匿名用户图像
|
||||
def url_to_avatar(source)
|
||||
if File.exist?(disk_filename(source&.class, source&.id))
|
||||
ctime = File.ctime(disk_filename(source.class, source&.id)).to_i
|
||||
if %w(User Organization).include?(source.class.to_s)
|
||||
File.join("images", relative_path, ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
ctime = File.ctime(disk_filename(source&.class, source&.id)).to_i
|
||||
if %w(User Organization).include?(source&.class.to_s)
|
||||
File.join("images", relative_path, ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
else
|
||||
File.join("images/avatars", ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
File.join("images/avatars", ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
end
|
||||
elsif source.class.to_s == 'User'
|
||||
elsif source&.class.to_s == 'User'
|
||||
source.get_letter_avatar_url
|
||||
end
|
||||
end
|
||||
|
||||
@@ -13,13 +13,13 @@ module AvatarHelper
|
||||
|
||||
def url_to_avatar(source)
|
||||
if File.exist?(disk_filename(source&.class, source&.id))
|
||||
ctime = File.ctime(disk_filename(source.class, source&.id)).to_i
|
||||
if %w(User Organization).include?(source.class.to_s)
|
||||
File.join("images", relative_path, ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
ctime = File.ctime(disk_filename(source&.class, source&.id)).to_i
|
||||
if %w(User Organization).include?(source&.class.to_s)
|
||||
File.join("images", relative_path, ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
else
|
||||
File.join("images/avatars", ["#{source.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
File.join("images/avatars", ["#{source&.class}", "#{source&.id}"]) + "?t=#{ctime}"
|
||||
end
|
||||
elsif source.class.to_s == 'User'
|
||||
elsif source&.class.to_s == 'User'
|
||||
source.get_letter_avatar_url
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user