修复:无法正常查询关联数据
This commit is contained in:
parent
1aeed8236d
commit
c1d791741c
|
@ -72,6 +72,7 @@ class Issue < ApplicationRecord
|
|||
has_many :assigners, through: :issue_assigners
|
||||
has_many :issue_participants
|
||||
has_many :participants, through: :issue_participants
|
||||
has_many :comment_journals, -> {where.not(notes: nil)}, class_name: "Journal", :as => :journalized
|
||||
|
||||
scope :issue_includes, ->{includes(:user)}
|
||||
scope :issue_many_includes, ->{includes(journals: :user)}
|
||||
|
|
|
@ -38,7 +38,7 @@ class Api::V1::Issues::ListService < ApplicationService
|
|||
|
||||
private
|
||||
def issue_query_data
|
||||
issues = @project.issues.issue_issue.joins(:journals).where.not(journals: {notes: nil})
|
||||
issues = @project.issues.issue_issue
|
||||
|
||||
case category
|
||||
when 'closed'
|
||||
|
@ -76,10 +76,10 @@ class Api::V1::Issues::ListService < ApplicationService
|
|||
# keyword
|
||||
q = issues.ransack(subject_or_description_cont: keyword)
|
||||
|
||||
scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :journals)
|
||||
scope = q.result.includes(:priority, :issue_status, :user, :assigners, :version, :issue_tags, :comment_journals)
|
||||
|
||||
|
||||
scope = scope.reorder("issues.#{sort_by} #{sort_direction}")
|
||||
scope = scope.reorder("issues.#{sort_by} #{sort_direction}").distinct
|
||||
|
||||
@queried_issues = scope
|
||||
end
|
||||
|
|
|
@ -17,4 +17,4 @@ end
|
|||
json.assigners issue.assigners.each do |assigner|
|
||||
json.partial! "api/v1/users/simple_user", locals: {user: assigner}
|
||||
end
|
||||
json.journals_count issue.journals.size
|
||||
json.journals_count issue.comment_journals.size
|
|
@ -1,4 +1,4 @@
|
|||
# json.total_count @issues.total_count
|
||||
json.total_count @issues.total_count
|
||||
json.issues @issues.each do |issue|
|
||||
json.partial! "simple_detail", locals: {issue: issue}
|
||||
end
|
Loading…
Reference in New Issue