Merge pull request '丰富数据和移除数据' (#230) from yystopf/forgeplus:pm_project_develop into pm_project_develop
This commit is contained in:
commit
fe137443f8
|
@ -90,7 +90,7 @@ class Api::Pm::IssuesController < Api::Pm::BaseController
|
||||||
end
|
end
|
||||||
|
|
||||||
def statues
|
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 = @statues.ransack(name_cont: params[:keyword]).result if params[:keyword].present?
|
||||||
@statues = kaminary_select_paginate(@statues)
|
@statues = kaminary_select_paginate(@statues)
|
||||||
render "api/v1/issues/statues/index"
|
render "api/v1/issues/statues/index"
|
||||||
|
|
|
@ -52,7 +52,7 @@ class IssuePriority < ApplicationRecord
|
||||||
when '立刻'
|
when '立刻'
|
||||||
'#f5222d'
|
'#f5222d'
|
||||||
else
|
else
|
||||||
'13b33e'
|
'#13b33e'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,8 +7,22 @@ json.tags issue.show_issue_tags.each do |tag|
|
||||||
end
|
end
|
||||||
json.status_name issue.issue_status&.name
|
json.status_name issue.issue_status&.name
|
||||||
json.status_id issue.status_id
|
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_name issue.priority&.name
|
||||||
json.priority_id issue.priority_id
|
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_name issue.version&.name
|
||||||
json.milestone_id issue.fixed_version_id
|
json.milestone_id issue.fixed_version_id
|
||||||
json.root_id issue.root_id
|
json.root_id issue.root_id
|
||||||
|
|
Loading…
Reference in New Issue