floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
xxq250 2023-04-18 10:12:23 +08:00
parent 46cf275a81 74bf8a4818
commit a3bb4986dd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue_tag.rb
View File

@ -28,7 +28,7 @@ class IssueTag < ApplicationRecord
belongs_to :project, optional: true, counter_cache: true belongs_to :project, optional: true, counter_cache: true
belongs_to :user, optional: true belongs_to :user, optional: true
validates :name, uniqueness: { message: "已存在" } validates :name, uniqueness: {scope: :project_id, message: "已存在" }
def self.init_data(project_id) def self.init_data(project_id)
data = [ data = [

4
app/views/project_trends/_detail.json.jbuilder
View File

@ -19,8 +19,10 @@ if trend.trend_type == "Issue"
elsif trend.trend_type == "VersionRelease" elsif trend.trend_type == "VersionRelease"
json.partial! "version_releases/simple_version_release", locals: {version: trend.trend} json.partial! "version_releases/simple_version_release", locals: {version: trend.trend}
elsif trend.trend_type == "CommitLog" 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 json.commit_log do
commit_log = trend.trend
json.user do json.user do
json.partial! 'users/user_simple', locals: {user: commit_log.user} json.partial! 'users/user_simple', locals: {user: commit_log.user}
end end