fix: 标签改为标记
This commit is contained in:
parent
91e6e0384e
commit
41d04e9e99
|
@ -158,6 +158,7 @@ class IssuesController < ApplicationController
|
|||
def update
|
||||
last_token = @issue.token
|
||||
last_status_id = @issue.status_id
|
||||
@issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
|
||||
if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
|
||||
@issue&.issue_tags_relates&.destroy_all
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
|
|
|
@ -77,12 +77,13 @@ class PullRequestsController < ApplicationController
|
|||
if params[:title].nil?
|
||||
normal_status(-1, "名称不能为空")
|
||||
elsif params[:issue_tag_ids].nil?
|
||||
normal_status(-1, "标签不能为空")
|
||||
normal_status(-1, "标记不能为空")
|
||||
else
|
||||
ActiveRecord::Base.transaction do
|
||||
begin
|
||||
merge_params
|
||||
|
||||
@issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
|
||||
if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
|
||||
@issue&.issue_tags_relates&.destroy_all
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
|
|
|
@ -31,7 +31,7 @@ zh-CN:
|
|||
branch_name: 分支
|
||||
close_pr: 合并
|
||||
merge: 合并
|
||||
issue_tags_value: 标签
|
||||
issue_tags_value: 标记
|
||||
lock_issue: 锁定工单
|
||||
unlock_issue: 解锁工单
|
||||
destroy_issue_depend: 删除依赖
|
||||
|
@ -55,7 +55,7 @@ zh-CN:
|
|||
f: 否
|
||||
true: 是
|
||||
false: 否
|
||||
issue_tag_ids: 标签
|
||||
issue_tag_ids: 标记
|
||||
issue_type: 分类
|
||||
token: 悬赏金额
|
||||
close_issue: 工单
|
||||
|
|
Loading…
Reference in New Issue