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

FIX 修复pulls、issues 搜索数量统计问题

Browse Source
This commit is contained in:
jasder
2021-06-18 10:52:14 +08:00
parent 80a6ad6712
commit 67e49a4f56
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/pull_requests_controller.rb
View File

@@ -15,13 +15,13 @@ class PullRequestsController < ApplicationController
@all_issues = issues.distinct
@filter_issues = @all_issues
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
@open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: 0})
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: 2})
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: 1})
@open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
@issues_size = @filter_issues.size
@issues_size = scopes.size
@issues = paginate(scopes)
end