forked from Trustie/forgeplus
fixed 提交者匹配用户
This commit is contained in:
parent
0840f632aa
commit
0fb519c963
|
|
@ -3,6 +3,6 @@ class Api::V1::Projects::CodeStatsController < Api::V1::BaseController
|
|||
|
||||
def index
|
||||
@result_object = Api::V1::Projects::CodeStats::ListService.call(@project, {ref: params[:ref]}, current_user&.gitea_token)
|
||||
puts @result_object
|
||||
# puts @result_object
|
||||
end
|
||||
end
|
||||
|
|
@ -1,17 +1,24 @@
|
|||
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"]
|
||||
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) : ""
|
||||
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)
|
||||
end
|
||||
end
|
||||
else
|
||||
json.id nil
|
||||
json.login name
|
||||
|
|
|
|||
Loading…
Reference in New Issue