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

fixed 贡献者匹配用户email

This commit is contained in:
xxq250 2023-05-18 14:22:53 +08:00
parent 2aeaee8479
commit 09b1007800
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/repositories/_contributor.json.jbuilder
View File

@ -1,20 +1,33 @@
user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"] || contributor["login"]}-#{contributor["email"]}") user = render_cache_commit_author(contributor)
if user.blank? if user.present?
if user.is_a?(Hash)
json.contributions contributor["commits"] || contributor["contributions"]
json.id user["id"]
json.login user["login"]
json.email user["email"]
json.type user["type"]
json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
json.image_url user["avatar_url"]
db_user = User.find_by_id(user["id"])
json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
else
json.contributions contributor["commits"] || contributor["contributions"]
json.id user.id
json.login user.login
json.email user.mail
json.type user.type
json.name user.real_name
json.image_url url_to_avatar(user)
json.contribution_perc user.simple_contribution_perc(project, contributor["contribution_perc"]) if user.present?
end
else
json.contributions contributor["commits"] || contributor["contributions"] json.contributions contributor["commits"] || contributor["contributions"]
json.id nil
json.login nil json.login nil
json.type nil json.type nil
json.name (contributor["name"] || contributor["login"]).to_s.downcase json.name (contributor["name"] || contributor["login"]).to_s.downcase
json.email contributor["email"] json.email contributor["email"]
json.image_url User::Avatar.get_letter_avatar_url(contributor["name"] || contributor["login"]) json.image_url User::Avatar.get_letter_avatar_url(contributor["name"] || contributor["login"])
json.contribution_perc User.new(login: (contributor["name"] || contributor["login"]), mail: contributor["email"]).simple_contribution_perc(project, contributor["contribution_perc"]) json.contribution_perc User.new(login: (contributor["name"] || contributor["login"]), mail: contributor["email"]).simple_contribution_perc(project, contributor["contribution_perc"])
else
json.contributions contributor["commits"] || contributor["contributions"]
json.id user["id"]
json.login user["login"]
json.email user["email"]
json.type user["type"]
json.name (user["name"] || contributor["name"] || contributor["login"]).to_s.downcase
json.image_url user["avatar_url"]
db_user = User.find_by_id(user["id"])
json.contribution_perc db_user.simple_contribution_perc(project, contributor["contribution_perc"]) if db_user.present?
end end