anph
/
forgeplus
forked from Trustie/forgeplus
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed 提交者匹配用户,log

This commit is contained in:
xxq250 2023-05-17 21:22:44 +08:00
parent 6afd275814
commit 3285c89698
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/api/v1/users/_commit_user.json.jbuilder
View File

@ -5,6 +5,7 @@ if user.present?
json.name user["name"]
json.type user["type"]
json.image_url user["avatar_url"]
json.user1 ""
elsif user.is_a?(Hash) && user["email"].present?
db_user = User.find_by(mail: user["email"])
json.id db_user&.id
@ -12,12 +13,14 @@ if user.present?
json.name db_user&.real_name || user["name"]
json.type db_user&.type
json.image_url db_user.present? ? url_to_avatar(db_user) : ""
json.user2 ""
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)
json.user3 ""
end
else
json.id nil
@ -25,4 +28,5 @@ else
json.name name
json.type nil
json.image_url User::Avatar.get_letter_avatar_url(name)
json.user4 ""
end