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

fix: compare commit author image url

This commit is contained in:
yystopf 2021-11-30 15:03:55 +08:00
parent 7a93db9ed2
commit a7d681c4dd
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/compare/show.json.jbuilder
View File

@ -3,19 +3,11 @@ json.commits_count @compare_result['Commits']&.size
json.commits do
json.array! @compare_result['Commits'] do |commit|
json.author do
# TODO: 获取头像地址待优化
forge_user = User.includes(:user_extension).find_by(login: commit['Author']['Name'])
json.login commit['Author']['Name']
json.name commit['Author']['Name']
json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
end
json.committer do
# TODO: 获取头像地址待优化
forge_user = User.includes(:user_extension).find_by(login: commit['Committer']['Name'])
json.login commit['Committer']['Name']
json.name commit['Committer']['Name']
json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
json.partial! 'repositories/commit_author', locals: { user: render_cache_commit_author(commit['Committer']), name: commit['Committer']['Name'] }
end
json.timestamp render_unix_time(commit['Committer']['When'])
json.time_from_now time_from_now(commit['Committer']['When'])