| @@ -1,7 +1,7 @@ | |||||
| class PullRequestsController < ApplicationController | class PullRequestsController < ApplicationController | ||||
| before_action :require_login, except: [:index, :show] | before_action :require_login, except: [:index, :show] | ||||
| before_action :load_repository | |||||
| before_action :set_user, only: [:new, :get_branches] | |||||
| before_action :find_project_with_id | |||||
| before_action :set_repository | |||||
| before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos] | before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos] | ||||
| # before_action :get_relatived, only: [:edit] | # before_action :get_relatived, only: [:edit] | ||||
| include TagChosenHelper | include TagChosenHelper | ||||
| @@ -70,11 +70,7 @@ class PullRequestsController < ApplicationController | |||||
| if local_requests.save | if local_requests.save | ||||
| remote_pr_params = @local_params | remote_pr_params = @local_params | ||||
| remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] | remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] | ||||
| if params[:fork_project_id].present? | |||||
| gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) | |||||
| else | |||||
| gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) | |||||
| end | |||||
| gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) | |||||
| 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| | ||||
| @@ -238,8 +234,12 @@ class PullRequestsController < ApplicationController | |||||
| private | private | ||||
| def set_user | |||||
| def set_repository | |||||
| @repository = @project.repository | |||||
| @user = @project.owner | @user = @project.owner | ||||
| normal_status(-1, "仓库不存在") unless @repository.present? | |||||
| normal_status(-1, "用户不存在") unless @user.present? | |||||
| end | end | ||||
| def find_pull_request | def find_pull_request | ||||