Browse Source

ADD some fileds for pull api

tags/v1.0.0
Jasder 5 years ago
parent
commit
0fe0f8a38b
3 changed files with 9 additions and 6 deletions
  1. +3
    -1
      app/controllers/pull_requests_controller.rb
  2. +3
    -0
      app/views/pull_requests/edit.json.jbuilder
  3. +3
    -5
      app/views/pull_requests/show.json.jbuilder

+ 3
- 1
app/controllers/pull_requests_controller.rb View File

@@ -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


+ 3
- 0
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! @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

+ 3
- 5
app/views/pull_requests/show.json.jbuilder View File

@@ -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






Loading…
Cancel
Save