From 0fe0f8a38bbe71f8e1f58354daf534fdd7d91420 Mon Sep 17 00:00:00 2001 From: Jasder <2053003901@@qq.com> Date: Wed, 4 Nov 2020 14:08:34 +0800 Subject: [PATCH] ADD some fileds for pull api --- app/controllers/pull_requests_controller.rb | 4 +++- app/views/pull_requests/edit.json.jbuilder | 3 +++ app/views/pull_requests/show.json.jbuilder | 8 +++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index d233fdfce..1d89a2031 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -65,7 +65,9 @@ class PullRequestsController < ApplicationController project_id: @project.id, issue_id: pull_issue.id, fork_project_id: params[:fork_project_id], - is_original: params[:is_original] + is_original: params[:is_original], + files_count: params[:files_count] || 0, + commits_count: params[:commits_count] || 0 } local_requests = PullRequest.new(@local_params.merge(pr_params)) if local_requests.save diff --git a/app/views/pull_requests/edit.json.jbuilder b/app/views/pull_requests/edit.json.jbuilder index 2e91aa530..c6f41559c 100644 --- a/app/views/pull_requests/edit.json.jbuilder +++ b/app/views/pull_requests/edit.json.jbuilder @@ -9,3 +9,6 @@ json.project_login @project.owner.try(:login) json.extract! @pull_request, :id, :title, :body, :milestone,:head,:base,:is_original json.extract! @issue, :assigned_to_id, :fixed_version_id, :priority_id json.issue_tag_ids @issue&.issue_tags_value&.split(",") +json.commits_count @pull_request.commits_count +json.files_count @pull_request.files_count +json.comments_count @pull_request.comments_count diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index b525d5438..61bbc9159 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -1,6 +1,9 @@ json.partial! "commons/success" json.project_name @project.name json.pr_time time_from_now(@pull_request.updated_at) +json.commits_count @pull_request.commits_count +json.files_count @pull_request.files_count +json.comments_count @pull_request.comments_count json.pull_request do json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original @@ -24,8 +27,3 @@ json.issue do json.version @issue.version.try(:name) json.issue_tags @issue.get_issue_tags end - - - - -