forked from Gitlink/forgeplus
FIX 修复pulls、issues 搜索数量统计问题
This commit is contained in:
parent
80a6ad6712
commit
67e49a4f56
|
@ -19,15 +19,15 @@ class IssuesController < ApplicationController
|
||||||
|
|
||||||
@all_issues = issues
|
@all_issues = issues
|
||||||
@filter_issues = @all_issues
|
@filter_issues = @all_issues
|
||||||
@filter_issues = @filter_issues.where.not(status_id: 5) if params[:status_type].to_i == 1
|
@filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
|
||||||
@filter_issues = @filter_issues.where(status_id: 5) if params[:status_type].to_i == 2
|
@filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
|
||||||
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
|
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
|
||||||
@open_issues = @all_issues.where.not(status_id: 5)
|
@open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
|
||||||
@close_issues = @all_issues.where(status_id: 5)
|
@close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
|
||||||
@assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
|
@assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
|
||||||
@my_published = @filter_issues.where(author_id: current_user&.id)
|
@my_published = @filter_issues.where(author_id: current_user&.id)
|
||||||
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
|
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
|
||||||
@issues_size = @filter_issues.size
|
@issues_size = scopes.size
|
||||||
@issues = paginate(scopes)
|
@issues = paginate(scopes)
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|
|
@ -15,13 +15,13 @@ class PullRequestsController < ApplicationController
|
||||||
@all_issues = issues.distinct
|
@all_issues = issues.distinct
|
||||||
@filter_issues = @all_issues
|
@filter_issues = @all_issues
|
||||||
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
|
@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})
|
@open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
|
||||||
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: 2})
|
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
|
||||||
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: 1})
|
@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))
|
@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")
|
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)
|
@issues = paginate(scopes)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
json.partial! "commons/success"
|
json.partial! "commons/success"
|
||||||
json.all_count @all_issues.size
|
|
||||||
json.open_count @open_issues.size
|
json.open_count @open_issues.size
|
||||||
json.close_count @close_issues.size
|
json.close_count @close_issues.size
|
||||||
json.assign_me_count @assign_to_me.size
|
json.assign_me_count @assign_to_me.size
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
json.partial! "commons/success"
|
json.partial! "commons/success"
|
||||||
json.all_count @all_issues.size
|
|
||||||
json.open_count @open_issues.size
|
json.open_count @open_issues.size
|
||||||
json.close_count @close_issues.size
|
json.close_count @close_issues.size
|
||||||
json.merged_issues_size @merged_issues.size
|
json.merged_issues_size @merged_issues.size
|
||||||
|
|
Loading…
Reference in New Issue