floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

FIX bug

This commit is contained in:
Jasder 2020-05-29 19:04:14 +08:00
parent d391972b8b
commit f47456f540
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/projects_helper.rb
View File

@ -29,4 +29,8 @@ module ProjectsHelper
member&.roles&.last&.name || permission member&.roles&.last&.name || permission
end end
def find_user_by_login_or_mail(identifier)
(User.find_by_login identifier) || (User.find_by_mail identifier)
end
end end

2
app/views/projects/branches.json.jbuilder
View File

@ -13,7 +13,7 @@ json.array! @branches do |branch|
json.time_from_now time_from_now(branch['commit']['timestamp']) json.time_from_now time_from_now(branch['commit']['timestamp'])
end end
user = User.find_by_login branch['commit']['author']['username'] user = find_user_by_login_or_mail(branch['commit']['author']['username'])
json.author do json.author do
if user if user
json.login user.login json.login user.login