From 41ab10410f572ec7891b71df4e71b7018b73acb4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 14 Sep 2016 13:15:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=20PullRequest=E5=90=8E=E9=9D=A2=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E8=AF=B7=E6=B1=82=E6=95=B0=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb              | 6 ++++++
 app/views/projects/_development_group.html.erb | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index feb825e6b..b5b6c5bd0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -925,6 +925,12 @@ module ApplicationHelper
     s.html_safe
   end
 
+  # 计算Pull Request的请求数目
+  def pull_request_count project
+    g = Gitlab.client
+    g.merge_requests(project.gpid).count
+  end
+
   #项目成员列表复选框生成
   def project_member_check_box_tags_ex name, principals
     s = ''
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
index e6f3ad3da..e3fa3cde1 100644
--- a/app/views/projects/_development_group.html.erb
+++ b/app/views/projects/_development_group.html.erb
@@ -44,6 +44,7 @@
 <% if allow_pull_request(@project) > 0 && allow_show_pull_request(@project) > 0 %>
     <div class="subNav">
       <%= link_to "Pull Requests", project_pull_requests_path(@project), :class => "f14 c_blue02" %>
+      <%= link_to "(#{pull_request_count(@project)})", project_pull_requests_path(@project), :class => "subnav_num c_orange",:id=>'project_files_count_nav' %>
       <% if User.current.member_of?(@project) %>
         <%= link_to "+新建请求", new_project_pull_request_path(:project_id => @project.id), :class => "subnav_green" %>
       <% end %>