Browse Source

fix

tags/v4.0.0
yystopf 4 years ago
parent
commit
c4e88ad690
2 changed files with 4 additions and 2 deletions
  1. +2
    -1
      app/views/pull_requests/index.json.jbuilder
  2. +2
    -1
      app/views/pull_requests/show.json.jbuilder

+ 2
- 1
app/views/pull_requests/index.json.jbuilder View File

@@ -7,7 +7,8 @@ json.limit @limit
json.user_admin_or_member @user_admin_or_member
json.user_admin_or_developer @user_admin_or_developer
json.project_name @project.name
json.project_author_name @project.owner.try(:login)
json.project_author @project.owner.try(:login)
json.project_author_name @project.owner.try(:show_real_name)

json.issues do
json.array! @issues.to_a do |issue|


+ 2
- 1
app/views/pull_requests/show.json.jbuilder View File

@@ -20,7 +20,8 @@ end

json.issue do
json.extract! @issue, :id,:subject,:description,:is_private, :branch_name
json.project_author_name @project.owner.try(:login)
json.project_author @project.owner.try(:login)
json.project_author_name @project.owner.try(:show_real_name)
#json.user_permission @user_permission
json.closed_on @issue.closed_on.present? ? format_time(@issue.closed_on) : ""
json.created_at format_time(@issue.created_on)


Loading…
Cancel
Save