forked from Trustie/forgeplus
更改:合并请求按创建事件倒序项目返回拥有者
This commit is contained in:
parent
221eafda7a
commit
064b0a6e19
|
|
@ -2,7 +2,7 @@ class Api::V1::Projects::DevelopProcessPullRequestsController < Api::V1::BaseCon
|
|||
def index
|
||||
@pull_requests = PullRequest.includes(:project, project: :project_category)
|
||||
@pull_requests = @pull_requests.ransack(m: 'or', project_name_cont: params[:keyword], project_identifier_cont: params[:keyword]).result if params[:keyword].present?
|
||||
@pull_requests = kaminari_paginate(@pull_requests)
|
||||
@pull_requests = kaminari_paginate(@pull_requests.order(created_at: :desc))
|
||||
end
|
||||
|
||||
def count
|
||||
|
|
|
|||
|
|
@ -23,4 +23,11 @@ end
|
|||
json.topics project.project_topics.each do |topic|
|
||||
json.(topic, :id, :name)
|
||||
end
|
||||
json.url project.full_url
|
||||
json.url project.full_url
|
||||
if project.owner.present?
|
||||
json.owner do
|
||||
json.partial! "api/v1/users/simple_user", user: project.owner
|
||||
end
|
||||
else
|
||||
json.nil!
|
||||
end
|
||||
Loading…
Reference in New Issue