diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index f45d1f35..52da4ac4 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -176,6 +176,7 @@ class PullRequestsController < ApplicationController @issue_assign_to = @issue.get_assign_user @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token) + @last_review = @pull_request.issue.reviews.take end def pr_merge diff --git a/app/controllers/reviews_controller.rb b/app/controllers/reviews_controller.rb index 17566060..eec57113 100644 --- a/app/controllers/reviews_controller.rb +++ b/app/controllers/reviews_controller.rb @@ -4,7 +4,8 @@ class ReviewsController < ApplicationController before_action :load_pull_request def create - @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) + return render_forbidden('您不是审查人员,无法进行审查!') if current_user&.id != @pull_request.issue.assigned_to_id + @journal, @review = Api::V1::Projects::PullRequests::Reviews::CreateService.call(@project, @pull_request, review_params, current_user) end private diff --git a/app/views/pull_requests/show.json.jbuilder b/app/views/pull_requests/show.json.jbuilder index 739bfd74..4d5e7aef 100644 --- a/app/views/pull_requests/show.json.jbuilder +++ b/app/views/pull_requests/show.json.jbuilder @@ -7,6 +7,18 @@ json.commits_count @gitea_pull["commit_num"] json.files_count @gitea_pull["changed_files"] json.comments_count @issue.journals.parent_journals.size json.comments_total_count @issue.get_journals_size +json.assign_user do + json.partial! 'users/user_simple', user: @issue_assign_to +end + +json.author do + json.partial! 'users/user_simple', user: @issue_user +end + +json.last_review do + json.(@last_review, :id, :commit_id, :content, :status) + json.created_at format_time(@last_review.created_at) +end json.pull_request do json.extract! @pull_request, :id,:base, :head, :status,:fork_project_id, :is_original