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 pull request '修复bug' (#218) from KingChan/forgeplus:pm_project_develop into pm_project_develop

This commit is contained in:
KingChan 2023-11-16 15:32:08 +08:00
parent 14d9ca760d 776533be8c
commit 5e192db530
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/pm/issues_controller.rb
View File

@ -23,9 +23,9 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
pm_issue_type = params[:pm_issue_type] || [1, 2, 3] pm_issue_type = params[:pm_issue_type] || [1, 2, 3]
not_join_id = case params[:issue_filter_type] not_join_id = case params[:issue_filter_type]
when 'leaf_issue' when 'leaf_issue'
@issue.pm_links.pluck(:be_linkable_id)
when 'link_issue'
Issue.where(root_id: @issue.id).pluck(:id) Issue.where(root_id: @issue.id).pluck(:id)
when 'link_issue'
@issue.pm_links.pluck(:be_linkable_id)
end end
not_join_id << @issue.id not_join_id << @issue.id

2
app/controllers/organizations/projects_controller.rb
View File

@ -10,7 +10,7 @@ class Organizations::ProjectsController < Organizations::BaseController
@projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects") @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
# 表情处理 # 表情处理
keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('') keywords = params[:search].to_s.each_char.select { |c| c.bytes.first < 240 }.join('')
@projects = (@projects.where(id: params[:pm_project_repository_ids].split(',')) if params[:pm_project_repository_ids].present?) @projects = @projects.where(id: params[:pm_project_repository_ids].split(',')) if params[:pm_project_repository_ids].present?
@projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present? @projects = @projects.ransack(name_or_identifier_cont: keywords).result if params[:search].present?
@projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}") @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
@projects = paginate(@projects) @projects = paginate(@projects)