Browse Source

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

pull/347/head
xxq250 1 year ago
parent
commit
6f8ccea616
2 changed files with 10 additions and 10 deletions
  1. +5
    -5
      app/helpers/application_helper.rb
  2. +5
    -5
      app/helpers/avatar_helper.rb

+ 5
- 5
app/helpers/application_helper.rb View File

@@ -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


+ 5
- 5
app/helpers/avatar_helper.rb View File

@@ -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

Loading…
Cancel
Save