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

Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
yystopf 2026-04-27 15:45:25 +08:00
parent 58a684e3db 6584b69dc1
commit bc6ad6ff29
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/helpers/projects_helper.rb
View File

@ -84,9 +84,10 @@ module ProjectsHelper
image_url: project.project_educoder.image_url
}
else
name = project.repository&.mirror_url.present? ? project.repository&.mirror_url.split('/')[-2] : project.owner.real_name
{
login: @owner.login,
name: @owner.real_name,
name: @owner.login == "NSCCN" ? name : @owner.real_name,
type: @owner.type,
image_url: url_to_avatar(@owner)
}

14
app/views/repositories/_nsccn_author.json.jbuilder Normal file
View File

@ -0,0 +1,14 @@
json.author do
if @project.forge?
json.id user.id
json.login user.login
json.type user&.type
json.name name
json.image_url url_to_avatar(user)
else
json.login @project.project_educoder&.repo_name&.split('/')[0]
json.name @project.project_educoder&.owner
json.type 'Educoder'
json.image_url @project.project_educoder&.image_url
end
end

8
app/views/repositories/detail.json.jbuilder
View File

@ -77,5 +77,9 @@ json.tags_count @result[:branch_tag_total_count].present? ? (@result[:branch_tag
# json.total_count total_count
# end
# json.languages @result[:language].blank? ? nil : @result[:language]
json.partial! 'author', locals: { user: @project.owner }
mirror_name = @project&.repository&.mirror_url.present? ? @project&.repository&.mirror_url.split('/')[-2] : @project&.owner&.real_name
if @project&.owner&.login == "NSCCN"
json.partial! 'nsccn_author', locals: { user: @project.owner, name: mirror_name }
else
json.partial! 'author', locals: { user: @project.owner }
end