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

ADD some fileds for pull api

This commit is contained in:
Jasder 2020-11-04 14:08:34 +08:00
parent 5d84df064a
commit 0fe0f8a38b
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/pull_requests_controller.rb
View File

@ -65,7 +65,9 @@ class PullRequestsController < ApplicationController
project_id: @project.id, project_id: @project.id,
issue_id: pull_issue.id, issue_id: pull_issue.id,
fork_project_id: params[:fork_project_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)) local_requests = PullRequest.new(@local_params.merge(pr_params))
if local_requests.save if local_requests.save

3
app/views/pull_requests/edit.json.jbuilder
View File

@ -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! @pull_request, :id, :title, :body, :milestone,:head,:base,:is_original
json.extract! @issue, :assigned_to_id, :fixed_version_id, :priority_id json.extract! @issue, :assigned_to_id, :fixed_version_id, :priority_id
json.issue_tag_ids @issue&.issue_tags_value&.split(",") 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

8
app/views/pull_requests/show.json.jbuilder
View File

@ -1,6 +1,9 @@
json.partial! "commons/success" json.partial! "commons/success"
json.project_name @project.name json.project_name @project.name
json.pr_time time_from_now(@pull_request.updated_at) 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.pull_request do
json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original 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.version @issue.version.try(:name)
json.issue_tags @issue.get_issue_tags json.issue_tags @issue.get_issue_tags
end end