From fe32adee167680705975e02b9aa4df91a7efd65e Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Fri, 8 May 2020 14:48:53 +0800 Subject: [PATCH] =?UTF-8?q?issues=E6=B7=BB=E5=8A=A0includes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 2 +- app/controllers/pull_requests_controller.rb | 2 +- app/models/issue.rb | 1 + app/services/issues/list_query_service.rb | 8 ++++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 154d94097..b1cd27d83 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -13,7 +13,7 @@ class IssuesController < ApplicationController def index @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user)) - issues = @project.issues.issue_issue.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times) + issues = @project.issues.issue_issue issues = issues.where(is_private: false) unless @user_admin_or_member @all_issues_size = issues.size @open_issues_size = issues.where.not(status_id: 5).size diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 691552576..557661042 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -9,7 +9,7 @@ class PullRequestsController < ApplicationController def index # @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call #通过gitea获取 - issues = @project.issues.issue_pull_request.includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times) + issues = @project.issues.issue_pull_request issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user)) @all_issues_size = issues.size @open_issues_size = issues.where.not(status_id: 5).size diff --git a/app/models/issue.rb b/app/models/issue.rb index d05caa70e..4f00ea0ce 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -22,6 +22,7 @@ class Issue < ApplicationRecord scope :issue_many_includes, ->{includes(journals: :user)} scope :issue_issue, ->{where(issue_classify: [nil,"issue"])} scope :issue_pull_request, ->{where(issue_classify: "pull_request")} + scope :issue_index_includes, ->{includes(:user,:tracker, :priority, :version, :issue_status, :journals, :issue_times)} after_update :change_versions_count diff --git a/app/services/issues/list_query_service.rb b/app/services/issues/list_query_service.rb index 46af67377..69b9d5bc2 100644 --- a/app/services/issues/list_query_service.rb +++ b/app/services/issues/list_query_service.rb @@ -13,12 +13,12 @@ class Issues::ListQueryService < ApplicationService start_time = params[:start_date] end_time = params[:due_date] + issues = all_issues.issue_index_includes + if status_type.to_s == "1" #表示开启中的 - issues = all_issues.where.not(status_id: 5) + issues = issues.where.not(status_id: 5) elsif status_type.to_s == "2" #表示关闭中的 - issues = all_issues.where(status_id: 5) - else - issues = all_issues + issues = issues.where(status_id: 5) end if search_name.present?