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: first commit show real commiter

This commit is contained in:
yystopf 2021-09-01 14:53:41 +08:00
parent 7e8e3e1b39
commit c50f9ef28d
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/helpers/application_helper.rb
View File

@ -434,6 +434,10 @@ module ApplicationHelper
User.find_by_login login
end
def find_user_by_gitea_uid(gitea_uid)
User.find_by(gitea_uid: gitea_uid)
end
def render_base64_decoded(str)
return nil if str.blank?
Base64.decode64 str

5
app/helpers/repositories_helper.rb
View File

@ -26,8 +26,9 @@ module RepositoriesHelper
end
def render_commit_author(author_json)
return nil if author_json.blank?
find_user_by_login author_json['name']
return nil if author_json.blank? || author_json["id"].blank?
# find_user_by_login author_json['name']
find_user_by_gitea_uid author_json['id']
end
def readme_render_decode64_content(str, path)

4
app/views/repositories/_commit.json.jbuilder
View File

@ -26,9 +26,9 @@ if @project.forge?
end
json.author do
json.partial! 'commit_author', user: render_commit_author(commit['commit']['author']), name: commit['commit']['author']['name']
json.partial! 'commit_author', user: render_commit_author(commit['author']), name: commit['commit']['author']['name']
end
json.committer do
json.partial! 'commit_author', user: render_commit_author(commit['commit']['committer']), name: commit['commit']['committer']['name']
json.partial! 'commit_author', user: render_commit_author(commit['committer']), name: commit['commit']['committer']['name']
end
end