floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-17 02:05:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge develop

Browse Source
This commit is contained in:
jasder
2021-05-08 18:16:45 +08:00
parent b161b66d79 9f837c62fb
commit 60b22b3912
81 changed files with 2326 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/admins/projects/shared/_list.html.erb
View File

@@ -23,7 +23,7 @@
<td><%= list_index_no((params[:page] || 1).to_i, index) %></td>
<td><%= project.id %></td>
<td class="text-left">
<%= link_to(project.name, "/projects/#{project.id}", target: '_blank') %>
<%= link_to(project.name, "/projects/#{project&.owner&.login}/#{project.identifier}", target: '_blank') %>
</td>
<td><%= project.is_public ? '√' : '' %></td>
<td><%= project.issues.size %></td>
@@ -33,7 +33,7 @@
<td><%= project.versions.size %></td>
<td><%= project.members.size %></td>
<td>
<%= project.owner ? link_to(project.owner&.real_name, "/users/#{project.owner&.login}", target: '_blank') : "" %>
<%= link_to_project(project) %>
</td>
<td><%= project.created_on&.strftime('%Y-%m-%d %H:%M') %></td>
<td class="action-container">

4
app/views/compare/show.json.jbuilder
View File

@@ -4,7 +4,7 @@ json.commits do
json.array! @compare_result['Commits'] do |commit|
json.author do
# TODO: 获取头像地址待优化
forge_user = User.includes(:user_extension).select(:id, :login).find_by(login: commit['Author']['Name'])
forge_user = User.includes(:user_extension).find_by(login: commit['Author']['Name'])
json.login commit['Author']['Name']
json.name commit['Author']['Name']
json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)
@@ -12,7 +12,7 @@ json.commits do
json.committer do
# TODO: 获取头像地址待优化
forge_user = User.includes(:user_extension).select(:id, :login).find_by(login: commit['Committer']['Name'])
forge_user = User.includes(:user_extension).find_by(login: commit['Committer']['Name'])
json.login commit['Committer']['Name']
json.name commit['Committer']['Name']
json.image_url forge_user.nil? ? '' : url_to_avatar(forge_user)

5
app/views/organizations/organizations/_simple.json.jbuilder Normal file
View File

@@ -0,0 +1,5 @@
json.id organization.id
json.name organization.login
json.nickname organization.nickname.blank? ? organization.name : organization.nickname
json.description organization.description
json.avatar_url url_to_avatar(organization)

21
app/views/projects/applied_transfer_projects/_detail.json.jbuilder Normal file
View File

@@ -0,0 +1,21 @@
project = object.project
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
end
end
json.user do
json.partial! "/users/user_simple", locals: {user: object.user}
end
json.owner do
json.partial! "/users/user_simple", locals: {user: object.owner}
end
json.id object.id
json.status object.status
json.created_at format_time(object.created_at)
json.time_ago time_from_now(object.created_at)

1
app/views/projects/applied_transfer_projects/cancel.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

1
app/views/projects/applied_transfer_projects/create.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

4
app/views/projects/applied_transfer_projects/organizations.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.total_count @organizations.size
json.organizations @organizations do |org|
json.partial! "/organizations/organizations/simple", locals: {organization: org}
end

10
app/views/pull_requests/_merge_item.json.jbuilder
View File

@@ -5,10 +5,10 @@ json.issue_priories @project_priories
json.project_author @project.owner.try(:show_real_name)
json.project_name @project.try(:name)
json.members do
json.array! @project_members.to_a.each do |member|
json.id member.user_id
json.login member.user.try(:login)
json.name member.user.try(:show_real_name)
json.avatar_url url_to_avatar(member.user)
json.array! @project_members.to_a.each do |user|
json.id user.id
json.login user.try(:login)
json.name user.try(:show_real_name)
json.avatar_url url_to_avatar(user)
end
end

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

@@ -21,7 +21,7 @@ json.versions_count @project.versions_count #里程碑数量
json.version_releases_count @project.releases_size(@user.try(:id), "all")
json.version_releasesed_count @project.releases_size(@user.try(:id), "released") #已发行的版本
json.permission render_permission(@user, @project)
json.mirror_url @project&.repository.mirror_url
json.mirror_url @project&.repository.source_clone_url
json.mirror @project&.repository.mirror_url.present?
json.type @project.numerical_for_project_type
json.open_devops @project.open_devops?
@@ -80,7 +80,7 @@ json.contributors do
total_count = @result[:contributor].size
json.list @result[:contributor].each do |contributor|
user = User.find_by(gitea_uid: contributor["id"])
if contributor["login"] == "root"
if contributor["login"] == "root" || user.nil?
total_count -= 1
next
end

7
app/views/repositories/edit.json.jbuilder
View File

@@ -7,4 +7,9 @@ json.project_language_id @project.project_language_id
json.private !@project.is_public
json.website @project.website
json.project_units @project.project_units.pluck(:unit_type)
json.lesson_url @project.lesson_url
json.lesson_url @project.lesson_url
json.permission render_permission(current_user, @project)
json.is_transfering @project.is_transfering
json.transfer do
json.partial! "/users/user_simple", locals: {user: @project&.applied_transfer_project&.owner}
end

13
app/views/users/_user_simple.json.jbuilder
View File

@@ -1,4 +1,9 @@
json.id user.id
json.name user.real_name
json.login user.login
json.image_url url_to_avatar(user)
if user.present?
json.id user.id
json.type user.type
json.name user.real_name
json.login user.login
json.image_url url_to_avatar(user)
else
json.nil!
end

26
app/views/users/applied_messages/_detail.json.jbuilder Normal file
View File

@@ -0,0 +1,26 @@
# project = object.project
# json.project do
# json.id project.id
# json.identifier project.identifier
# json.name project.name
# json.description project.description
# json.is_public project.is_public
# json.owner do
# json.partial! "/users/user_simple", locals: {user: project.owner}
# end
# end
# json.user do
# json.partial! "/users/user_simple", locals: {user: object.user}
# end
json.applied do
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: object.applied}
end
json.applied_user do
json.partial! "/users/user_simple", locals: {user: object.applied_user}
end
json.applied_type object.applied_type
json.name object.name
json.viewed object.viewed
json.status object.status
json.created_at format_time(object.created_at)
json.time_ago time_from_now(object.created_at)

4
app/views/users/applied_messages/index.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.total_count @applied_messages.total_count
json.applied_messages @applied_messages do |message|
json.partial! "/users/applied_messages/detail", locals: {object: message}
end

1
app/views/users/applied_transfer_projects/accept.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

4
app/views/users/applied_transfer_projects/index.json.jbuilder Normal file
View File

@@ -0,0 +1,4 @@
json.total_count @applied_transfer_projects.total_count
json.applied_transfer_projects @applied_transfer_projects do |apply|
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: apply}
end

1
app/views/users/applied_transfer_projects/refuse.json.jbuilder Normal file
View File

@@ -0,0 +1 @@
json.partial! "/projects/applied_transfer_projects/detail", locals: {object: @applied_transfer_project}

2
app/views/users/show.json.jbuilder
View File

@@ -10,6 +10,8 @@ json.user_identity @user.identity
json.is_watch current_user&.watched?(@user)
json.watched_count @user.fan_count #粉丝
json.watching_count @user.follow_count #关注数
json.undo_messages @waiting_applied_messages.size
json.undo_transfer_projects @common_applied_transfer_projects.size
json.undo_events @undo_events
json.user_composes_count @user_composes_count
json.user_org_count @user_org_count