From e092c1f222397515582e6457c989435fde0373f2 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 13:49:36 +0800 Subject: [PATCH 1/5] Change --- app/controllers/pull_requests_controller.rb | 6 ++++-- app/views/pull_requests/new.json.jbuilder | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index fdf52104..71435379 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -29,7 +29,8 @@ class PullRequestsController < ApplicationController @projects_names = [{ project_user_login: @user.try(:login), project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}", - project_id: @project.identifier + project_id: @project.identifier, + id: @project.id }] @merge_projects = @projects_names fork_project = @project.fork_project if @is_fork @@ -37,7 +38,8 @@ class PullRequestsController < ApplicationController @merge_projects.push({ project_user_login: fork_project.owner.try(:login), project_name: "#{fork_project.owner.try(:show_real_name)}/#{fork_project.repository.try(:identifier)}", - project_id: fork_project.identifier + project_id: fork_project.identifier, + id: fork_project.id }) end end diff --git a/app/views/pull_requests/new.json.jbuilder b/app/views/pull_requests/new.json.jbuilder index 7d406f68..8110e297 100644 --- a/app/views/pull_requests/new.json.jbuilder +++ b/app/views/pull_requests/new.json.jbuilder @@ -1,5 +1,6 @@ json.partial! "commons/success" json.project_id @project.identifier +json.id @project.id json.branches @all_branches json.is_fork @is_fork json.projects_names @projects_names From b1d974c3621d6c4d0f089768b88270a8df3a94e0 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:35:31 +0800 Subject: [PATCH 2/5] Change --- app/controllers/pull_requests_controller.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 71435379..da09c46b 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -71,8 +71,17 @@ class PullRequestsController < ApplicationController local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save 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] - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + if local_requests.is_original && params[:merge_user_login] + remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact + + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @project.fork_project.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 + #remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] + + #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 params[:issue_tag_ids].present? params[:issue_tag_ids].each do |tag| From 531b66e862a360aaf44043921bc06644db525cb5 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:48:12 +0800 Subject: [PATCH 3/5] Change --- app/controllers/pull_requests_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index da09c46b..918a6508 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -61,11 +61,14 @@ class PullRequestsController < ApplicationController merge_params pull_issue = Issue.new(@issue_params) if pull_issue.save! + if params[:fork_project_id].present? + _fork_project = @project.fork_project + end pr_params = { user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: params[:fork_project_id], + fork_project_id: _fork_project.id, is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) @@ -74,7 +77,7 @@ class PullRequestsController < ApplicationController if local_requests.is_original && params[:merge_user_login] remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.fork_project.owner, @project.fork_project.try(:identifier), remote_pr_params.except(:milestone)) + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project.owner, _fork_project.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)) From fae9df56a48d68299155194059cb7819c5932fbe Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 14:49:52 +0800 Subject: [PATCH 4/5] cahnge --- app/controllers/pull_requests_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 918a6508..52c175f5 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -68,7 +68,7 @@ class PullRequestsController < ApplicationController user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: _fork_project.id, + fork_project_id: _fork_project&.id, is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) @@ -77,7 +77,7 @@ class PullRequestsController < ApplicationController if local_requests.is_original && params[:merge_user_login] remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project.owner, _fork_project.try(:identifier), remote_pr_params.except(:milestone)) + gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project&.owner, _fork_project.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)) From 1bfcc466fe28bb7c36e32a3a6414e0c355b56eb6 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Sat, 15 Aug 2020 15:04:09 +0800 Subject: [PATCH 5/5] change --- app/controllers/pull_requests_controller.rb | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 52c175f5..71435379 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -61,30 +61,18 @@ class PullRequestsController < ApplicationController merge_params pull_issue = Issue.new(@issue_params) if pull_issue.save! - if params[:fork_project_id].present? - _fork_project = @project.fork_project - end pr_params = { user_id: current_user.try(:id), project_id: @project.id, issue_id: pull_issue.id, - fork_project_id: _fork_project&.id, + fork_project_id: params[:fork_project_id], is_original: params[:is_original] } local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save remote_pr_params = @local_params - if local_requests.is_original && params[:merge_user_login] - remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact - - gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), _fork_project&.owner, _fork_project.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 - #remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] - - #gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone)) + remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login] + 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 params[:issue_tag_ids].present? params[:issue_tag_ids].each do |tag|