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: project trace tasks name rule change

This commit is contained in:
yystopf 2022-05-17 11:34:08 +08:00
parent f51ebaad67
commit 4fade5d0b7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/projects_controller.rb
View File

@ -22,7 +22,7 @@ class ProjectsController < ApplicationController
menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge? menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions") menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge? menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
menu.append(menu_hash_by_name("services")) if @project.has_menu_permission("services") && @project.forge? && @project.member?(current_user.id) menu.append(menu_hash_by_name("services")) if @project.has_menu_permission("services") && @project.forge? && (current_user.admin? || @project.member?(current_user.id))
menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge? menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
menu.append(menu_hash_by_name("activity")) menu.append(menu_hash_by_name("activity"))
menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge? menu.append(menu_hash_by_name("settings")) if user_is_admin && @project.forge?

4
app/controllers/traces/projects_controller.rb
View File

@ -32,10 +32,10 @@ class Traces::ProjectsController < Traces::BaseController
limit = params[:limit] || params[:per_page] limit = params[:limit] || params[:per_page]
limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
page = params[:page].to_i.zero? ? 1 : params[:page].to_i page = params[:page].to_i.zero? ? 1 : params[:page].to_i
return render :json => {data: []} if current_user.trace_user.nil? return render :json => {left_tasks_count: 5, data: []} if current_user.trace_user.nil?
code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit) code, data, error = Trace::CheckResultService.call(current_user.trace_token, @project, nil, page, limit)
if code == 200 if code == 200
render :json => {data: data} render :json => {left_tasks_count: 5 - @project.user_trace_tasks.size ,data: data}
else else
render_error("获取检测记录失败 Error:#{error}") render_error("获取检测记录失败 Error:#{error}")
end end

2
app/services/trace/check_result_service.rb
View File

@ -19,7 +19,7 @@ class Trace::CheckResultService < Trace::ClientService
private private
def request_params def request_params
{ {
product_name: "#{project&.owner&.id}#{project.id}", product_name: Digest::MD5.hexdigest.new(project&.id.to_s),
file_name: file_name, file_name: file_name,
pageNum: page_num, pageNum: page_num,
pageSize: page_size, pageSize: page_size,

2
app/services/trace/check_service.rb
View File

@ -19,7 +19,7 @@ class Trace::CheckService < Trace::ClientService
def request_params def request_params
repo = Gitea::Repository::GetService.call(project&.owner, project&.identifier) repo = Gitea::Repository::GetService.call(project&.owner, project&.identifier)
{ {
product_name: "#{project&.owner&.id}#{project&.id}", product_name: Digest::MD5.hexdigest.new(project&.id.to_s),
product_type: project&.project_category&.name || '其他', product_type: project&.project_category&.name || '其他',
code_type: project&.project_language&.name || '其他', code_type: project&.project_language&.name || '其他',
product_desc: project&.description, product_desc: project&.description,