Browse Source

fix: 标签改为标记

tags/v3.2.0
yystopf 4 years ago
parent
commit
41d04e9e99
3 changed files with 5 additions and 3 deletions
  1. +1
    -0
      app/controllers/issues_controller.rb
  2. +2
    -1
      app/controllers/pull_requests_controller.rb
  3. +2
    -2
      config/locales/zh-CN.yml

+ 1
- 0
app/controllers/issues_controller.rb View File

@@ -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|


+ 2
- 1
app/controllers/pull_requests_controller.rb View File

@@ -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|


+ 2
- 2
config/locales/zh-CN.yml View File

@@ -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…
Cancel
Save