diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 0da4ca730..b4ee673f7 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -28,6 +28,8 @@ class IssueTag < ApplicationRecord belongs_to :project, optional: true, counter_cache: true belongs_to :user, optional: true + validates :name, uniqueness: {scope: :project_id, message: "已存在" } + def self.init_data(project_id) data = [ ["缺陷", "表示存在意外问题或错误", "#d92d4c"], diff --git a/app/views/project_trends/_detail.json.jbuilder b/app/views/project_trends/_detail.json.jbuilder index f8d1006dd..e7c590b8f 100644 --- a/app/views/project_trends/_detail.json.jbuilder +++ b/app/views/project_trends/_detail.json.jbuilder @@ -19,8 +19,10 @@ if trend.trend_type == "Issue" elsif trend.trend_type == "VersionRelease" json.partial! "version_releases/simple_version_release", locals: {version: trend.trend} elsif trend.trend_type == "CommitLog" + commit_log = trend.trend + json.name commit_log.message + json.created_at format_time(commit_log.created_at) json.commit_log do - commit_log = trend.trend json.user do json.partial! 'users/user_simple', locals: {user: commit_log.user} end diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d5c68d448..28d9c12ef 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -18,7 +18,7 @@ zh-CN: Issue: 疑修(Issue) PullRequest: 合并请求(PR) VersionRelease: 版本发布 - CommitLog: 代码(Commit) + CommitLog: 代码提交(Commit) create: 创建了 journal: 回复了 close: 关闭了 @@ -234,6 +234,8 @@ zh-CN: content: 'git忽略文件内容' feedback_message_history: title: '' + issue_tag: + name: '项目标记' close_pr: 合并请求 roles: Developer: 开发者