floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix

This commit is contained in:
yystopf 2021-10-14 18:31:27 +08:00
parent 79b394d291
commit ffa0715374
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/pull_requests_controller.rb
View File

@ -58,7 +58,7 @@ class PullRequestsController < ApplicationController
ActiveRecord::Base.transaction do ActiveRecord::Base.transaction do
@pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params) @pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
if @gitea_pull_request[:status] == :success if @gitea_pull_request[:status] == :success
@pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"]) @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"], @gitea_pull_request[:body]["id"])
SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id)
SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id)
else else

2
app/models/pull_request.rb
View File

@ -54,7 +54,7 @@ class PullRequest < ApplicationRecord
Project.find_by(id: self.fork_project_id) Project.find_by(id: self.fork_project_id)
end end
def bind_gitea_pull_request!(gitea_pull_number, gitea_pull_id=gitea_pull_number) def bind_gitea_pull_request!(gitea_pull_number, gitea_pull_id)
update_columns( update_columns(
gitea_number: gitea_pull_number, gitea_number: gitea_pull_number,
gitea_id: gitea_pull_id) gitea_id: gitea_pull_id)