From d286d3fe062d50980b8267a92d9e50d120144f9b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 2 Aug 2016 15:44:25 +0800
Subject: [PATCH] =?UTF-8?q?pullrequest=E5=A4=B4=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_pull_request_container.html.erb          |  0
 app/views/pull_requests/index.html.erb        | 35 +++++++++----------
 2 files changed, 16 insertions(+), 19 deletions(-)
 create mode 100644 app/views/pull_requests/_pull_request_container.html.erb

diff --git a/app/views/pull_requests/_pull_request_container.html.erb b/app/views/pull_requests/_pull_request_container.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/pull_requests/index.html.erb b/app/views/pull_requests/index.html.erb
index b680dcb60..654ffb824 100644
--- a/app/views/pull_requests/index.html.erb
+++ b/app/views/pull_requests/index.html.erb
@@ -1,3 +1,4 @@
+<%= render "pull_request_container" %>
 <ul id="mergeBanner" class="project-merge-banner">
   <li><a href="javascript:void(0);">打开<span class="project-number-dot">1</span></a></li>
   <li><a href="javascript:void(0);">合并<span class="project-number-dot">1</span></a></li>
@@ -7,26 +8,22 @@
 </ul>
 <div class="cl"></div>
 <ul class="project-merge-content">
-  <li>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第三次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>
-    <div class="cl mb5"></div>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
-    <div class="cl"></div>
-  </li>
-  <li>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第二次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">合并</span>
-    <div class="cl mb5"></div>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
-    <div class="cl"></div>
-  </li>
-  <li>
-    <a href="javascript:void(0);" class="linkGrey3 fb fl">第一次提交</a><a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">打开</span>
-    <div class="cl mb5"></div>
-    <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue">Administrator</a> 创建于3小时前</span><span class="fr fontGrey2">3小时前更新</span>
-    <div class="cl"></div>
-  </li>
+  <% if @requests.nil? %>
+      <div class="no-merge-content">没有可显示的请求</div>
+  <% else %>
+      <% @requests.each do |request| %>
+          <li>
+            <% request %>
+            <a href="javascript:void(0);" class="linkGrey3 fb fl"><%= request.title %></a>
+            <a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>
+            <div class="cl mb5"></div>
+            <span class="fontGrey2">#5 · <a href="javascript:void(0);" class="link-blue"><%= request.author.try(:username) %></a> 创建于<%= time_tag(request.created_at) %></span>
+            <span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
+            <div class="cl"></div>
+          </li>
+      <% end %>
+  <% end %>
 </ul>
-<div class="no-merge-content">没有可显示的请求</div>
 
 <script>
     $("#mergeBanner").parent().css("width","730px");