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

Merge branch 'dev_trustie' into dev_chain

This commit is contained in:
Jasder 2020-06-29 18:29:07 +08:00
parent 94227b104c d4962b5c75
commit d806c4cc09
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/projects_controller.rb
View File

@ -100,8 +100,7 @@ class ProjectsController < ApplicationController
end end
def simple def simple
project = Project.includes(:owner).select(:id, :name, :identifier, :user_id).find params[:id] project = Project.includes(:owner, :repository).select(:id, :name, :identifier, :user_id, :project_type).find params[:id]
json_response(project) json_response(project)
end end

16
app/helpers/projects_helper.rb
View File

@ -29,7 +29,17 @@ module ProjectsHelper
end end
def json_response(project) def json_response(project)
json = { repo = project.repository
tmp_json = {}
unless project.common?
tmp_json = tmp_json.merge({
mirror_status: repo.mirror_status,
mirror_num: repo.mirror_num,
first_sync: repo.first_sync?
})
end
tmp_json = tmp_json.merge({
identifier: project.identifier, identifier: project.identifier,
name: project.name, name: project.name,
id: project.id, id: project.id,
@ -38,7 +48,7 @@ module ProjectsHelper
name: project.owner.real_name, name: project.owner.real_name,
image_url: url_to_avatar(project.owner) image_url: url_to_avatar(project.owner)
} }
} }).compact
render json: json render json: tmp_json
end end
end end