Change Dun Check

This commit is contained in:
sylor_huang@126.com 2020-08-18 11:02:09 +08:00
parent c9a263e03c
commit e0bedf175f
5 changed files with 13 additions and 8 deletions

View File

@ -140,7 +140,7 @@ class IssuesController < ApplicationController
# normal_status(0, "创建成功",)
render :json => { status: 0, message: "创建成功", id: @issue.id}
else
normal_status(-1, "创建失败")
normal_status(-1, @issue.errors.messages.values[0][0])
end
end
@ -202,7 +202,7 @@ class IssuesController < ApplicationController
@issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
normal_status(0, "更新成功")
else
normal_status(-1, "更新失败")
normal_status(-1, @issue.errors.messages.values[0][0])
end
end

View File

@ -46,7 +46,7 @@ class JournalsController < ApplicationController
render :json => { status: 0, message: "评论成功", id: journal.id}
# normal_status(0, "评论成功")
else
normal_status(-1, "评论失败")
normal_status(-1, journal.errors.messages.values[0][0])
end
end
end
@ -70,7 +70,7 @@ class JournalsController < ApplicationController
if @journal.update_attribute(:notes, content)
normal_status(0, "更新成功")
else
normal_status(-1, "更新失败")
normal_status(-1, @journal.errors.messages.values[0][0])
end
else
normal_status(-1, "评论的内容不能为空")

View File

@ -94,8 +94,10 @@ class PullRequestsController < ApplicationController
normal_status(-1, "PullRequest创建失败")
end
else
normal_status(-1, "PullRequest创建失败")
normal_status(-1, local_requests.errors.messages.values[0][0])
end
else
normal_status(-1, pull_issue.errors.messages.values[0][0])
end
rescue => e
normal_status(-1, e.message)
@ -145,8 +147,10 @@ class PullRequestsController < ApplicationController
normal_status(-1, "PullRequest更新失败")
end
else
normal_status(-1, "PullRequest更新失败")
normal_status(-1, @pull_request.errors.messages.values[0][0])
end
else
normal_status(-1, @issue.errors.messages.values[0][0])
end
rescue => e
normal_status(-1, e.message)

View File

@ -83,7 +83,7 @@ class VersionsController < ApplicationController
if version.save
normal_status(0, "里程碑创建成功")
else
normal_status(-1, "里程碑创建失败")
normal_status(-1, version.errors.messages.values[0][0])
end
end
@ -121,7 +121,7 @@ class VersionsController < ApplicationController
if @version.update_attributes(tag_params)
normal_status(0, "里程碑更新成功")
else
normal_status(-1, "里程碑更新失败")
normal_status(-1, version.errors.messages.values[0][0])
end
end
else

View File

@ -1,4 +1,5 @@
class Version < ApplicationRecord
include DunCheckAble
belongs_to :project, counter_cache: true
has_many :issues, class_name: "Issue", foreign_key: "fixed_version_id"
belongs_to :user, optional: true