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

Merge branch 'dev_trustie' into dev_devops

Browse Source
This commit is contained in:
Jasder
2020-08-19 17:13:48 +08:00
parent 1159a47b3e 6ea4cacc9a
commit ac2d2b842d
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/users_controller.rb
View File

@@ -151,8 +151,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,
@@ -167,6 +169,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)