forked from Trustie/forgeplus
新增:标记列表返回合并请求数量
This commit is contained in:
parent
317ff3c76b
commit
edc00d28a7
|
@ -9,7 +9,7 @@ class Api::V1::Issues::IssueTagsController < Api::V1::BaseController
|
|||
if params[:only_name]
|
||||
@issue_tags = kaminary_select_paginate(@issue_tags.select(:id, :name, :color))
|
||||
else
|
||||
@issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user))
|
||||
@issue_tags = kaminari_paginate(@issue_tags.includes(:project, :user, :issue_issues, :pull_request_issues))
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -23,6 +23,8 @@ class IssueTag < ApplicationRecord
|
|||
|
||||
has_many :issue_tags_relates, dependent: :destroy
|
||||
has_many :issues, through: :issue_tags_relates
|
||||
has_many :issue_issues, -> {where(issue_classify: [nil,"issue"])}, source: :issue, through: :issue_tags_relates
|
||||
has_many :pull_request_issues, -> {where(issue_classify: "pull_request")}, source: :issue, through: :issue_tags_relates
|
||||
belongs_to :project, optional: true, counter_cache: true
|
||||
belongs_to :user, optional: true
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
json.total_issues_count @opened_issues_count
|
||||
json.total_issues_count @total_issues_count
|
||||
json.opened_count @opened_issues_count
|
||||
json.closed_count @closed_issues_count
|
||||
json.total_count @issues.total_count
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
json.(tag,:id, :name, :description, :color, :issues_count)
|
||||
json.(tag,:id, :name, :description, :color)
|
||||
json.issues_count tag.issue_issues.size
|
||||
json.pull_requests_count tag.pull_request_issues.size
|
||||
json.project do
|
||||
if tag.project.present?
|
||||
json.partial! "api/v1/projects/simple_detail", project: tag.project
|
||||
|
|
Loading…
Reference in New Issue