diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index dfc3e5f1f..4b073415a 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -19,15 +19,15 @@ class IssuesController < ApplicationController @all_issues = 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(status_id: 5) if params[:status_type].to_i == 2 + @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: 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? - @open_issues = @all_issues.where.not(status_id: 5) - @close_issues = @all_issues.where(status_id: 5) + @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED) + @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED) @assign_to_me = @filter_issues.where(assigned_to_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") - @issues_size = @filter_issues.size + @issues_size = scopes.size @issues = paginate(scopes) respond_to do |format| diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 2a9713f8d..8521cd4b3 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -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 diff --git a/app/views/issues/index.json.jbuilder b/app/views/issues/index.json.jbuilder index 0f778fafe..994453f0a 100644 --- a/app/views/issues/index.json.jbuilder +++ b/app/views/issues/index.json.jbuilder @@ -1,5 +1,4 @@ json.partial! "commons/success" -json.all_count @all_issues.size json.open_count @open_issues.size json.close_count @close_issues.size json.assign_me_count @assign_to_me.size diff --git a/app/views/pull_requests/index.json.jbuilder b/app/views/pull_requests/index.json.jbuilder index b83266475..e13f10058 100644 --- a/app/views/pull_requests/index.json.jbuilder +++ b/app/views/pull_requests/index.json.jbuilder @@ -1,5 +1,4 @@ json.partial! "commons/success" -json.all_count @all_issues.size json.open_count @open_issues.size json.close_count @close_issues.size json.merged_issues_size @merged_issues.size