fixed 提交者匹配用户

This commit is contained in:
xxq250 2023-05-17 21:18:26 +08:00
parent 0fb519c963
commit 6afd275814
2 changed files with 9 additions and 8 deletions

View File

@ -2,7 +2,7 @@ class Api::V1::Projects::CodeStatsController < Api::V1::BaseController
before_action :require_public_and_member_above, only: [:index]
def index
@result_object = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: params[:ref]}, current_user&.gitea_token)
@result_object = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: params[:ref]}, @project.owner&.gitea_token)
# puts @result_object
end
end

View File

@ -1,16 +1,17 @@
if user.present?
if user.is_a?(Hash)
if user.is_a?(Hash) && user["id"].present?
json.id user["id"]
json.login user["login"]
json.name user["name"]
json.type user["type"]
json.image_url user["avatar_url"]
else
json.id user.id
json.login user.login
json.name user.real_name
json.type user&.type
json.image_url url_to_avatar(user)
elsif user.is_a?(Hash) && user["email"].present?
db_user = User.find_by(mail: user["email"])
json.id db_user&.id
json.login db_user&.login || user["login"]
json.name db_user&.real_name || user["name"]
json.type db_user&.type
json.image_url db_user.present? ? url_to_avatar(db_user) : ""
end
else
json.id nil