From 30572aa41c0aaa87f113b9bbdfeb81aaccbab6b5 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 11 Nov 2022 11:11:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index a9e6ee6a1..63471c10c 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -95,20 +95,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 From f98886b3a073e9a8a06ecd5ae1faa8bef254806f Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 11 Nov 2022 11:50:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/feedback_message_history.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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