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 trustie_related_projects 接口添加项目相关链接

This commit is contained in:
Jasder 2020-08-19 16:24:24 +08:00
parent a36072e8f1
commit 6ea4cacc9a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/users_controller.rb
View File

@ -149,8 +149,10 @@ class UsersController < ApplicationController
def trustie_related_projects def trustie_related_projects
projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc") projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
projects_json = [] projects_json = []
domain_url = EduSetting.get('host_name') + '/projects'
if projects.present? if projects.present?
projects.each do |p| projects.each do |p|
project_url = "/#{p.owner.login}/#{p.identifier}"
pj = { pj = {
id: p.id, id: p.id,
name: p.name, name: p.name,
@ -165,6 +167,10 @@ class UsersController < ApplicationController
members_count: p&.members.size, members_count: p&.members.size,
issues_count: p.issues_count - p.pull_requests_count, issues_count: p.issues_count - p.pull_requests_count,
commits_count: p&.project_score&.changeset_num.to_i, commits_count: p&.project_score&.changeset_num.to_i,
http_url: domain_url + project_url,
http_collaborator_url: domain_url + project_url + "/setting/collaborator",
http_issues_url: domain_url + project_url + "/issues",
http_commits_url: domain_url + project_url + "/commits",
project_score: p&.project_score.present? ? p&.project_score&.as_json(:except=>[:created_at, :updated_at]).merge!(commit_time: format_time(p&.project_score&.commit_time)) : {} project_score: p&.project_score.present? ? p&.project_score&.as_json(:except=>[:created_at, :updated_at]).merge!(commit_time: format_time(p&.project_score&.commit_time)) : {}
} }
projects_json.push(pj) projects_json.push(pj)
@ -177,7 +183,7 @@ class UsersController < ApplicationController
def trustie_projects def trustie_projects
user_id = User.select(:id, :login).where(login: params[:login])&.first&.id user_id = User.select(:id, :login).where(login: params[:login])&.first&.id
projects = Project.visible projects = Project.visible
projects = projects.joins(:members).where(members: { user_id: user_id }) projects = projects.joins(:members).where(members: { user_id: user_id })
search = params[:search].to_s.strip search = params[:search].to_s.strip