From e140fb536c12f44cd9389e8e1040efe0bc996fc9 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Mon, 17 Apr 2023 18:38:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh-CN.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index d5c68d448..b9000c1ee 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: 关闭了 From f078c59cf4e2067695d9f609a30f752415c7f0c5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 18 Apr 2023 09:44:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E8=AE=B0=E5=B7=B2=E5=AD=98=E5=9C=A8validate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue_tag.rb | 2 ++ config/locales/zh-CN.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 0da4ca730..98e0f9072 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: { message: "已存在" } + def self.init_data(project_id) data = [ ["缺陷", "表示存在意外问题或错误", "#d92d4c"], diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index e7c586417..b09b55f45 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -233,6 +233,8 @@ zh-CN: content: 'git忽略文件内容' feedback_message_history: title: '' + issue_tag: + name: '项目标记' close_pr: 合并请求 roles: Developer: 开发者 From 827e265fc51edef8ef6c08b0d213f09cbb8c5a01 Mon Sep 17 00:00:00 2001 From: xxq250 Date: Tue, 18 Apr 2023 09:56:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8F=90=E4=BA=A4=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/project_trends/_detail.json.jbuilder | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From 031f2769835c1e18d00f8a707ea5cb0c8f8e1e09 Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 18 Apr 2023 10:08:17 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E6=A0=A1?= =?UTF-8?q?=E9=AA=8Cscope=E6=96=B0=E5=A2=9Eproject=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue_tag.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/issue_tag.rb b/app/models/issue_tag.rb index 98e0f9072..b4ee673f7 100644 --- a/app/models/issue_tag.rb +++ b/app/models/issue_tag.rb @@ -28,7 +28,7 @@ class IssueTag < ApplicationRecord belongs_to :project, optional: true, counter_cache: true belongs_to :user, optional: true - validates :name, uniqueness: { message: "已存在" } + validates :name, uniqueness: {scope: :project_id, message: "已存在" } def self.init_data(project_id) data = [