From 4cde7c374e9874569dcc475371ff9a6bc61d42c8 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 11 Nov 2022 14:04:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E6=84=8F=E8=A7=81=E7=BC=96=E8=BE=91=E5=99=A8=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E4=B8=8A=E4=BC=A0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admins/feedbacks/new_history.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/feedbacks/new_history.js.erb b/app/views/admins/feedbacks/new_history.js.erb index 2b96cf488..c795b0f5b 100644 --- a/app/views/admins/feedbacks/new_history.js.erb +++ b/app/views/admins/feedbacks/new_history.js.erb @@ -1,3 +1,3 @@ $("#feedback-modals").html("<%= j render(partial: 'admins/feedbacks/history_form_modal', locals: {type: 'new_history'}) %>") $(".feedback-history-change-modal").modal('show'); -createMDEditor('feedback-history-email-editor', {width: 750, height: 300, placeholder: '请输入邮件正文',watch: false }); +createMDEditor('feedback-history-email-editor', {width: 750, height: 300, placeholder: '请输入邮件正文',watch: false, imageUpload: false }); From 49abadfa3f9e759f5d4bbc54db1848ab976dc388 Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 11 Nov 2022 14:13:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=90=88?= =?UTF-8?q?=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=90=88=E5=B9=B6=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E6=8C=82=E8=BD=BD=E7=9A=84issue=E8=AE=BE=E7=BD=AE=E4=B8=BA?= =?UTF-8?q?=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/pull_requests_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 63471c10c..d2115fb30 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -146,6 +146,8 @@ class PullRequestsController < ApplicationController colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user) if colsed === true @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE) + # 合并请求下issue处理为关闭 + @issue&.update_attributes!({status_id:5}) SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu? normal_status(1, "已拒绝") else @@ -191,6 +193,8 @@ class PullRequestsController < ApplicationController # @pull_request.project_trend_status! @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE) @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id) + # 合并请求下issue处理为关闭 + @issue&.update_attributes!({status_id:5}) SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id) if Site.has_notice_menu? normal_status(1, "合并成功") else