From 67760fd1a97b3913dca059db37e5bd2d1d8c1ae7 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Wed, 26 Apr 2023 16:07:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A1=E7=8C=AE=E8=80=85=E5=AE=B9=E9=94=99?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/_contributor.json.jbuilder | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/repositories/_contributor.json.jbuilder b/app/views/repositories/_contributor.json.jbuilder index 0c4ddfb51..da2ae37dc 100644 --- a/app/views/repositories/_contributor.json.jbuilder +++ b/app/views/repositories/_contributor.json.jbuilder @@ -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?