Browse Source

FIX render commmiter and author avatar bug

tags/v3.0.2^2
jasder 5 years ago
parent
commit
45f05c9fc4
3 changed files with 10 additions and 5 deletions
  1. +8
    -3
      app/models/user/avatar.rb
  2. +1
    -1
      app/views/repositories/_commit_author.json.jbuilder
  3. +1
    -1
      app/views/repositories/commits.json.jbuilder

+ 8
- 3
app/models/user/avatar.rb View File

@@ -11,11 +11,16 @@ class User
end

def get_letter_avatar_url(size = :lg)
avatar_path(size).split('public/')&.last
avatar_path(self.username, size).split('public/')&.last
end

def avatar_path(size)
LetterAvatar.generate self.username, avatar_size(size)
def self.get_letter_avatar_url(name, size = :lg)
return "" if name.blank?
avatar_path(Pinyin.t(name), size).split('public/')&.last
end
def avatar_path(username, size)
LetterAvatar.generate username, avatar_size(size)
end
# 返回头像尺寸


+ 1
- 1
app/views/repositories/_commit_author.json.jbuilder View File

@@ -7,5 +7,5 @@ else
json.id nil
json.login name
json.name name
json.image_url File.join("avatars/User","b")
json.image_url User.get_letter_avatar_url(name)
end

+ 1
- 1
app/views/repositories/commits.json.jbuilder View File

@@ -26,7 +26,7 @@ else
json.login commit['commit']['author']['name']
json.type nil
json.name commit['commit']['author']['name']
json.image_url File.join("avatars/User","b")
json.image_url User.get_letter_avatar_url(commit['commit']['author']['name'])
end
end
end


Loading…
Cancel
Save