diff --git a/app/controllers/pull_requests_controller.rb b/app/controllers/pull_requests_controller.rb index a1f77dffa..d65c00722 100644 --- a/app/controllers/pull_requests_controller.rb +++ b/app/controllers/pull_requests_controller.rb @@ -21,6 +21,13 @@ class PullRequestsController < ApplicationController @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 + + @limit = 10 + @is_remote = true + @count = type_count(type, @requests_opened_count, @requests_merged_count, @requests_closed_count) + @pages = Paginator.new @count, @limit, params['page'] || 1 + @offset ||= @pages.offset + @requests = paginateHelper @requests, 10 respond_to do |format| format.html format.js diff --git a/app/helpers/pull_requests_helper.rb b/app/helpers/pull_requests_helper.rb index c33100ea8..fc9e7b4c8 100644 --- a/app/helpers/pull_requests_helper.rb +++ b/app/helpers/pull_requests_helper.rb @@ -25,4 +25,15 @@ module PullRequestsHelper end end + def type_count type, requests_opened_count, requests_merged_count, requests_closed_count + case type + when nil, "1" + requests_opened_count + when "2" + requests_merged_count + when "3" + requests_closed_count + end + end + end diff --git a/app/views/pull_requests/_pull_requests_list.html.erb b/app/views/pull_requests/_pull_requests_list.html.erb index e32940ca3..80866afca 100644 --- a/app/views/pull_requests/_pull_requests_list.html.erb +++ b/app/views/pull_requests/_pull_requests_list.html.erb @@ -12,4 +12,13 @@
<% end %> + +
+
+ +
+
+
<% end %> \ No newline at end of file diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb index 23ca13178..78c4759aa 100644 --- a/app/views/pull_requests/index.html.erb +++ b/app/views/pull_requests/index.html.erb @@ -13,6 +13,7 @@ <%= render "pull_requests/pull_requests_list" %> +