From 867434531d81a616ead01b2db7a643694cb9f150 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 9 Aug 2016 15:28:06 +0800
Subject: [PATCH] =?UTF-8?q?pull=20request=20=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/pull_requests_controller.rb          |  7 +++++++
 app/helpers/pull_requests_helper.rb                  | 11 +++++++++++
 app/views/pull_requests/_pull_requests_list.html.erb |  9 +++++++++
 app/views/pull_requests/index.html.erb               |  1 +
 public/stylesheets/css/project.css                   |  2 +-
 5 files changed, 29 insertions(+), 1 deletion(-)

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 @@
           <div class="cl"></div>
         </li>
     <% end %>
+
+    <div style="text-align:center;">
+      <div class="pages" style="width:auto; display:inline-block;">
+        <ul  id="homework_pository_ref_pages">
+          <%= pagination_links_full @pages, @count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
+        </ul>
+        <div class="cl"></div>
+      </div>
+    </div>
 <% 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" %>
 </ul>
 
+
 <script>
     $("#mergeBanner").parent().css("width","730px");
 
diff --git a/public/stylesheets/css/project.css b/public/stylesheets/css/project.css
index 6b5bdffdb..bb1e382c9 100644
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@@ -523,7 +523,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .project-merge-banner li a {padding:14px; font-size:14px; color:#555; display:inline-block;}
 .project-number-dot {display:inline-block; min-width:10px; padding:3px 5px; font-size:12px; color:#888; line-height:1; vertical-align:middle; white-space:nowrap; text-align:center; background-color:#eee; border-radius:10px; margin-left:5px;}
 .project-merge-content {}
-.project-merge-content li {padding:10px; margin:0 -10px; background-color:#f9f9f9; border-bottom:1px solid #e5e5e5;}
+.project-merge-content>li {padding:10px; margin:0 -10px; background-color:#f9f9f9; border-bottom:1px solid #e5e5e5;}
 .no-merge-content {padding:10px 15px; color:#888;}
 .new-merge-request {border-bottom:1px solid #ddd; padding-bottom:10px;}
 .new-merge-wrap {font-size:13px; color:#484848; border-bottom:1px solid #ddd; padding:10px 0;}