Browse Source

贡献者容错处理

pull/342/head
xxq250 3 years ago
parent
commit
67760fd1a9
1 changed files with 4 additions and 4 deletions
  1. +4
    -4
      app/views/repositories/_contributor.json.jbuilder

+ 4
- 4
app/views/repositories/_contributor.json.jbuilder View File

@@ -1,6 +1,6 @@
user = $redis_cache.hgetall("v2-owner-common:#{contributor["name"] || contributor["login"]}-#{contributor["email"]}")
if user.blank?
json.contributions contributor["commits"]
json.contributions contributor["commits"] || contributor["contributions"]
json.login contributor["name"].to_s.downcase || contributor["login"].to_s.downcase
json.type nil
json.name contributor["name"].to_s.downcase || contributor["login"].to_s.downcase
@@ -8,12 +8,12 @@ if user.blank?
json.image_url User::Avatar.get_letter_avatar_url(contributor["name"] || contributor["login"])
json.contribution_perc User.new(login: contributor["name"], mail: contributor["email"]).simple_contribution_perc(project, contributor["contribution_perc"])
else
json.contributions contributor["commits"]
json.contributions contributor["commits"] || contributor["contributions"]
json.id user["id"]
json.login user["login"]
json.login user["login"] || contributor["name"].to_s.downcase || contributor["login"].to_s.downcase
json.email user["email"]
json.type user["type"]
json.name user["name"].to_s.downcase
json.name user["name"].to_s.downcase || contributor["name"].to_s.downcase || 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?


Loading…
Cancel
Save