修改pull_request的报错
This commit is contained in:
parent
c5cce418c7
commit
479e938493
|
@ -111,7 +111,7 @@ class PullRequestsController < ApplicationController
|
||||||
if pull_issue.save!
|
if pull_issue.save!
|
||||||
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id))
|
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id))
|
||||||
if local_requests.save
|
if local_requests.save
|
||||||
gitea_request = Gitea::PullRequest::CreateService.new(@project.owner, @repository.try(:identifier), requests_params).call
|
gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), requests_params).call
|
||||||
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
||||||
if params[:issue_tag_ids].present?
|
if params[:issue_tag_ids].present?
|
||||||
params[:issue_tag_ids].each do |tag|
|
params[:issue_tag_ids].each do |tag|
|
||||||
|
|
|
@ -90,7 +90,7 @@ class RepositoriesController < ApplicationController
|
||||||
if pull_issue.save!
|
if pull_issue.save!
|
||||||
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id))
|
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id))
|
||||||
if local_requests.save
|
if local_requests.save
|
||||||
gitea_request = Gitea::PullRequest::CreateService.new(current_user, @project.try(:identifier), requests_params).call
|
gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @project.try(:identifier), requests_params).call
|
||||||
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
||||||
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
class Gitea::PullRequest::CreateService < Gitea::ClientService
|
class Gitea::PullRequest::CreateService < Gitea::ClientService
|
||||||
attr_reader :user, :repo, :params
|
attr_reader :token, :user, :repo, :params
|
||||||
|
|
||||||
# params ex:
|
# params ex:
|
||||||
# {
|
# {
|
||||||
|
@ -11,7 +11,8 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService
|
||||||
# }
|
# }
|
||||||
# 以上列子说明从develop分支合并到master分支
|
# 以上列子说明从develop分支合并到master分支
|
||||||
# repo: 仓库名称
|
# repo: 仓库名称
|
||||||
def initialize(user, repo, params={})
|
def initialize(token, user, repo, params={})
|
||||||
|
@token = token
|
||||||
@user = user
|
@user = user
|
||||||
@repo = repo
|
@repo = repo
|
||||||
@params = params
|
@params = params
|
||||||
|
@ -30,6 +31,6 @@ class Gitea::PullRequest::CreateService < Gitea::ClientService
|
||||||
end
|
end
|
||||||
|
|
||||||
def request_params
|
def request_params
|
||||||
Hash.new.merge(token: @user.gitea_token, data: @params)
|
Hash.new.merge(token: token, data: @params)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue