diff --git a/app/forms/base_form.rb b/app/forms/base_form.rb index 46eaa9b58..598644fc2 100644 --- a/app/forms/base_form.rb +++ b/app/forms/base_form.rb @@ -50,9 +50,8 @@ class BaseForm def check_verifi_code(verifi_code, code) code = strip(code) # return if code == "123123" # TODO 万能验证码,用于测试 - - raise VerifiCodeError, "验证码不正确" if verifi_code&.code != code raise VerifiCodeError, "验证码已失效" if !verifi_code&.effective? + raise VerifiCodeError, "验证码不正确" if verifi_code&.code != code end private diff --git a/app/models/issue.rb b/app/models/issue.rb index c642e642b..f1e2a2d0f 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -153,6 +153,10 @@ class Issue < ApplicationRecord end end + def is_collaborators? + self.assigned_to_id.present? ? self.project.members.where(user_id: self.assigned_to_id).present? : false + end + def get_issue_tags_name if issue_tags.present? issue_tags.select(:name).uniq.pluck(:name).join(",") diff --git a/app/views/issues/edit.json.jbuilder b/app/views/issues/edit.json.jbuilder index eae63c3c7..5b8ff23ba 100644 --- a/app/views/issues/edit.json.jbuilder +++ b/app/views/issues/edit.json.jbuilder @@ -5,6 +5,7 @@ json.done_ratio @issue.done_ratio.to_s + "%" json.issue_tags @issue.get_issue_tags json.cannot_edit_tags @cannot_edit_tags json.issue_current_user @issue.author_id == current_user.try(:id) +json.assigned_to_id @issue.is_collaborators? ? @issue.assigned_to_id : nil # json.issue_chosen @issue_chosen # json.branches @all_branches json.attachments do diff --git a/config/locales/forms/projects_create_form.zh-CN.yml b/config/locales/forms/projects_create_form.zh-CN.yml index e36a0520a..54de8e71a 100644 --- a/config/locales/forms/projects_create_form.zh-CN.yml +++ b/config/locales/forms/projects_create_form.zh-CN.yml @@ -1,7 +1,7 @@ -'zh-CN': - activemodel: - attributes: - projects/create_form: - name: 项目名称 - repository_name: 仓库名称 +'zh-CN': + activemodel: + attributes: + projects/create_form: + name: 项目名称 + repository_name: 项目标识 description: 项目简介 \ No newline at end of file