diff --git a/app/controllers/api/pm/issues_controller.rb b/app/controllers/api/pm/issues_controller.rb index e562a52e8..991265db3 100644 --- a/app/controllers/api/pm/issues_controller.rb +++ b/app/controllers/api/pm/issues_controller.rb @@ -90,7 +90,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController end def statues - @statues = IssueStatus.order("position asc") + @statues = IssueStatus.where.not(name: "反馈").order("position asc") @statues = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present? @statues = kaminary_select_paginate(@statues) render "api/v1/issues/statues/index" diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb index 9a3d69392..3c08c8098 100644 --- a/app/models/issue_priority.rb +++ b/app/models/issue_priority.rb @@ -52,7 +52,7 @@ class IssuePriority < ApplicationRecord when '立刻' '#f5222d' else - '13b33e' + '#13b33e' end end end diff --git a/app/views/api/v1/issues/_simple_detail.json.jbuilder b/app/views/api/v1/issues/_simple_detail.json.jbuilder index 3460c8c65..15259baa5 100644 --- a/app/views/api/v1/issues/_simple_detail.json.jbuilder +++ b/app/views/api/v1/issues/_simple_detail.json.jbuilder @@ -7,8 +7,22 @@ json.tags issue.show_issue_tags.each do |tag| end json.status_name issue.issue_status&.name json.status_id issue.status_id +json.status do + if issue.issue_status.present? + json.partial! "api/v1/issues/statues/simple_detail", locals: {status: issue.issue_status} + else + json.nil! + end +end json.priority_name issue.priority&.name json.priority_id issue.priority_id +json.priority do + if issue.priority.present? + json.partial! "api/v1/issues/issue_priorities/simple_detail", locals: {priority: issue.priority} + else + json.nil! + end +end json.milestone_name issue.version&.name json.milestone_id issue.fixed_version_id json.root_id issue.root_id