diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index 4a9e560f6..bfc2ab9f7 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -17,19 +17,21 @@ class PullRequestsController < ApplicationController @allow_to_pull_request = allow_pull_request(@project) > 0 type = params[:type] + merge_requests = @g.merge_requests(@project.gpid) + merge_requests_count = merge_requests.count case type when nil, "1" - @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "opened" || request.state == "reopened"} + @requests = merge_requests.select{|request| request.state == "opened" || request.state == "reopened"} # 更新统计数字 - project_score = @project.project_score.update_column(:pull_request_num, @requests.count) + project_score = @project.project_score.update_column(:pull_request_num, merge_requests_count) when "2" - @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "merged"} + @requests = merge_requests.select{|request| request.state == "merged"} when "3" - @requests = @g.merge_requests(@project.gpid).select{|request| request.state == "closed"} + @requests = merge_requests.select{|request| request.state == "closed"} end @requests_opened_count = @requests.count - @requests_merged_count = @g.merge_requests(@project.gpid).select{|request| request.state == "merged"}.count - @requests_closed_count = @g.merge_requests(@project.gpid).select{|request| request.state == "closed"}.count + @requests_merged_count = merge_requests.select{|request| request.state == "merged"}.count + @requests_closed_count = merge_requests.select{|request| request.state == "closed"}.count @limit = 10 @is_remote = true