diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index e81b68807..c14c8f7f6 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -100,20 +100,6 @@ class PullRequestsController < ApplicationController Issues::UpdateForm.new({subject: params[:title], description: params[:body].blank? ? params[:body] : params[:body].b}).validate! merge_params - @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank? - if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists? - if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1 - return normal_status(-1, "最多只能创建一个标记。") - elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1 - @issue&.issue_tags_relates&.destroy_all - params[:issue_tag_ids].each do |tag| - IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag) - end - else - return normal_status(-1, "请输入正确的标记。") - end - end - reviewers = User.where(id: params[:reviewer_ids]) @pull_request.reviewers = reviewers diff --git a/app/models/feedback_message_history.rb b/app/models/feedback_message_history.rb index b50e8b27e..6d338d73c 100644 --- a/app/models/feedback_message_history.rb +++ b/app/models/feedback_message_history.rb @@ -26,7 +26,7 @@ class FeedbackMessageHistory < ApplicationRecord private def send_meessage_email - unless UserMailer.feedback_email(user&.mail, title, content).deliver_now + unless UserMailer.feedback_email(feedback&.user&.mail, title, content).deliver_now errors[:title] << '邮件发送失败!' end end