FIX auto generate avatar bug
This commit is contained in:
parent
b6e8a135f0
commit
21befb6486
|
@ -149,7 +149,7 @@ module ApplicationHelper
|
||||||
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.letter_avatar_url
|
source.get_letter_avatar_url
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,23 @@
|
||||||
require 'letter_avatar/has_avatar'
|
require 'letter_avatar/has_avatar'
|
||||||
|
require 'chinese_pinyin'
|
||||||
|
|
||||||
class User
|
class User
|
||||||
module Avatar
|
module Avatar
|
||||||
extend ActiveSupport::Concern
|
extend ActiveSupport::Concern
|
||||||
include LetterAvatar::HasAvatar
|
include LetterAvatar::HasAvatar
|
||||||
|
|
||||||
def name
|
def username
|
||||||
lastname.blank? ? login : Pinyin.t(lastname)
|
self.lastname.blank? ? self.login : Pinyin.t(self.lastname)
|
||||||
end
|
end
|
||||||
|
|
||||||
def letter_avatar_url(size = :lg)
|
def get_letter_avatar_url(size = :lg)
|
||||||
avatar_url(avatar_size(size))
|
avatar_path(size).split('public/')&.last
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def avatar_path(size)
|
||||||
|
LetterAvatar.generate self.username, avatar_size(size)
|
||||||
|
end
|
||||||
|
|
||||||
# 返回头像尺寸
|
# 返回头像尺寸
|
||||||
# xs: 22px
|
# xs: 22px
|
||||||
# sm: 32px
|
# sm: 32px
|
||||||
|
|
|
@ -3,5 +3,5 @@ LetterAvatar.setup do |config|
|
||||||
config.cache_base_path = 'public/system/lets' # default is 'public/system'
|
config.cache_base_path = 'public/system/lets' # default is 'public/system'
|
||||||
config.colors_palette = :iwanthue # default is :google
|
config.colors_palette = :iwanthue # default is :google
|
||||||
config.annotate_position = '-0+10' # default is -0+5
|
config.annotate_position = '-0+10' # default is -0+5
|
||||||
config.letters_count = 2 # default is 1
|
# config.letters_count = 2 # default is 1
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue