floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

issues添加includes

This commit is contained in:
sylor_huang@126.com 2020-05-08 14:48:53 +08:00
parent 700537f4e2
commit fe32adee16
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/issues_controller.rb
View File

@ -13,7 +13,7 @@ class IssuesController < ApplicationController
def index def index
@user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user)) @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 issues = issues.where(is_private: false) unless @user_admin_or_member
@all_issues_size = issues.size @all_issues_size = issues.size
@open_issues_size = issues.where.not(status_id: 5).size @open_issues_size = issues.where.not(status_id: 5).size

2
app/controllers/pull_requests_controller.rb
View File

@ -9,7 +9,7 @@ class PullRequestsController < ApplicationController
def index def index
# @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call #通过gitea获取 # @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)) issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
@all_issues_size = issues.size @all_issues_size = issues.size
@open_issues_size = issues.where.not(status_id: 5).size @open_issues_size = issues.where.not(status_id: 5).size

1
app/models/issue.rb
View File

@ -22,6 +22,7 @@ class Issue < ApplicationRecord
scope :issue_many_includes, ->{includes(journals: :user)} scope :issue_many_includes, ->{includes(journals: :user)}
scope :issue_issue, ->{where(issue_classify: [nil,"issue"])} scope :issue_issue, ->{where(issue_classify: [nil,"issue"])}
scope :issue_pull_request, ->{where(issue_classify: "pull_request")} 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 after_update :change_versions_count

8
app/services/issues/list_query_service.rb
View File

@ -13,12 +13,12 @@ class Issues::ListQueryService < ApplicationService
start_time = params[:start_date] start_time = params[:start_date]
end_time = params[:due_date] end_time = params[:due_date]
issues = all_issues.issue_index_includes
if status_type.to_s == "1" #表示开启中的 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" #表示关闭中的 elsif status_type.to_s == "2" #表示关闭中的
issues = all_issues.where(status_id: 5) issues = issues.where(status_id: 5)
else
issues = all_issues
end end
if search_name.present? if search_name.present?